]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Sep 2011 05:51:21 +0000 (15:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Sep 2011 05:51:21 +0000 (15:51 +1000)
commit23fc67dc9696fc8886ed8aee6371a756c23d33af
tree7e53a0ce8f232ef3a2db0e8003fa5207c6aff3b1
parent226693b5b0d9d5575ff926cd66eceb0c7977daf5
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig