]> 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>
Tue, 22 Nov 2011 00:41:34 +0000 (11:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 22 Nov 2011 00:41:34 +0000 (11:41 +1100)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge