]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 1 Aug 2011 02:34:34 +0000 (12:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 1 Aug 2011 02:34:34 +0000 (12:34 +1000)
Conflicts:
drivers/leds/Kconfig


Trivial merge