]> 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, 29 Jul 2011 03:57:10 +0000 (13:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 29 Jul 2011 03:57:10 +0000 (13:57 +1000)
commit07f32abe6c69b760afe3cbc44dd89e3b0db7f9cc
tree3c0e0474cd5e96cf47607d5870264cfc7ff0acc0
parent7e17c7e705e67831e86cb7c6d009ee2600d1a9e5
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig