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

Conflicts:
drivers/leds/Kconfig