]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'char-misc.current/char-misc-linus'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 20 Nov 2011 23:01:15 +0000 (10:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 20 Nov 2011 23:01:15 +0000 (10:01 +1100)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge