]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 29 Jul 2011 03:57:10 +0000 (13:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 29 Jul 2011 03:57:10 +0000 (13:57 +1000)
Conflicts:
drivers/leds/Kconfig


Trivial merge