]> 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, 25 Oct 2011 06:28:17 +0000 (17:28 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 25 Oct 2011 06:28:17 +0000 (17:28 +1100)
commit7e2614c0a60c4de3e3f16491a31ae069d78cb8f6
treec7f17925cf7f2bc784e298d83772f1347cc518e3
parenta7cc82b04830e294a496c44b603f4249d2c48f56
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig