Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
Chris Metcalf [Thu, 17 Mar 2011 18:14:12 +0000 (14:14 -0400)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge