]> 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, 19 Aug 2011 01:24:04 +0000 (11:24 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Aug 2011 01:24:04 +0000 (11:24 +1000)
commite9e1265fb2f60e7064f9cf017fcfba7e435bae8f
treed6ab8427f205e334a49f3d452a257a7bb8300ab4
parent74f252fa12ce14832545190920d95c0013372368
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig