]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 02:50:39 +0000 (13:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 02:50:39 +0000 (13:50 +1100)
Conflicts:
drivers/leds/Kconfig


Trivial merge