]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Sep 2011 01:22:08 +0000 (11:22 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Sep 2011 01:22:08 +0000 (11:22 +1000)
commitb5f8d7fbed1dcc5161cae4f37e84405f61e43284
treee71c231dacd506107152e9c1a75bfa7e56aa2f2a
parentc9370bf9f05f7078bdd8841cbc2722718aa89776
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig