]> 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, 30 Sep 2011 01:51:25 +0000 (11:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 01:51:25 +0000 (11:51 +1000)
commit8cff09b1b1e939f0e5553b2cd5f7ed515202f1ef
tree720ef7e90ae4feffaab8096602b7a2d9e31c212c
parent3a198777bd05cc4d153e1153620affc9edbb4fde
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig