]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Aug 2011 03:26:08 +0000 (13:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 23 Aug 2011 03:26:08 +0000 (13:26 +1000)
commit5a16c48fe9498e7f0162ae6e131c136a2d433d39
treec06f8b2dcd1aed760f61086510fa6d4330ddbe92
parent8188ee2adf7d9b93b82db1713952b121bde6ed44
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig