]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 02:34:06 +0000 (12:34 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Aug 2011 02:34:06 +0000 (12:34 +1000)
commit28f3591b5319a5fa02de1649ea33d810b5b4e808
tree79f3233f11cc918cc0f6a3f95f42f0f327a34855
parent66f510f779d7593974e150fd4470fa60be3e34ba
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig