]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 18 Aug 2011 03:23:52 +0000 (13:23 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 18 Aug 2011 03:23:52 +0000 (13:23 +1000)
commitb725f370035aaa9535aad7a3c75171358037e47c
treeca360bdeb08d914039136c44fc8773b6784393cc
parent4d8d754dc90f7eb492b6b5b0c094fa0aeb3c96d1
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig