]> 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, 5 Sep 2011 05:00:58 +0000 (15:00 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 05:00:58 +0000 (15:00 +1000)
commit51899f1bde1423e88e8a67bc175bf04fedac8db5
treeda2e6e57916023dd797bc7bc3997e6d9fa5589b1
parent5cd2606f39e3aa60af340ba63bea91326b928322
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig