]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 03:22:55 +0000 (14:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 03:22:55 +0000 (14:22 +1100)
Conflicts:
drivers/leds/Kconfig


Trivial merge