]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 04:06:11 +0000 (14:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 04:06:11 +0000 (14:06 +1000)
Conflicts:
drivers/leds/Kconfig


Trivial merge