]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Aug 2011 02:18:55 +0000 (12:18 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Aug 2011 02:18:55 +0000 (12:18 +1000)
commit62b4fed3889b939684e5bb6aea69489166691bf4
tree4442dcf4084ae44099a29a6ead4a82ab9f06a143
parent4fd286142cd8f063dd22ccef104ba95714da1f61
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig