Merge branch 's3c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
Russell King [Thu, 25 Jun 2009 12:49:07 +0000 (13:49 +0100)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge