]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 12 Aug 2011 02:31:10 +0000 (12:31 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 12 Aug 2011 02:31:10 +0000 (12:31 +1000)
commit039ca9f7b25dc1b1d68856e80897ed08b885eb48
treed0f70a7d52cbbf29664202f372e20f5eb0176ce6
parentcace7dff4030e8b1a0c5a142f1dc1d7f45a09e56
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig