]> 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, 5 Oct 2011 03:48:10 +0000 (14:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Oct 2011 03:48:10 +0000 (14:48 +1100)
commit39c9b53827ac3f09729ebe8501f41804d7663358
tree892d703156cf3a3f60b5cb8d24beedef44ac10b6
parent4aefa709da55dde80fb73b6e541a07c201edc1e6
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig