diff --git a/[refs] b/[refs] index 93adff23f15f..c9b8c2572f54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f222e8b40f2177b1c4cac015b117744c1d3fa3e9 +refs/heads/master: cb2f33e9596632979c140c243ac1e8e994f62180 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index b1114cfac6bf..fa76ad0a37e8 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -904,7 +904,7 @@ F: drivers/input/misc/ati_remote2.c ATLX ETHERNET DRIVERS M: Jay Cliburn -M: Chris Snook +M: Chris Snook M: Jie Yang L: atl1-devel@lists.sourceforge.net W: http://sourceforge.net/projects/atl1