]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Aug 2011 00:35:46 +0000 (10:35 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Aug 2011 00:35:46 +0000 (10:35 +1000)
commit212f2ebecf18a839da0d4da98518aa78c13ab4f2
tree9ce9f6ea98bdf279f94db32bf44886d16213443f
parent5a59550e8473f0ec2c9470ea8a6912fab1e5f2a6
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig