]> 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, 17 Aug 2011 02:06:47 +0000 (12:06 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 17 Aug 2011 02:06:47 +0000 (12:06 +1000)
commit8c121733de43992231e482a7df27908b8861f673
tree47b1c593bb64b7605fea2ba9dc70c6c4f22147f1
parent09d2dd67342893c52157e40aca12f988adf95eff
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig