]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'leds/for-mm'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 03:22:55 +0000 (14:22 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 03:22:55 +0000 (14:22 +1100)
commitc7dcb997ebad4aaeec20e94ce13671a303a26cba
tree2cb72ecdae8b99b2184ed2d2134aec3b46126aa5
parentfc5ed3571384cccb0085fa5d0266b542efc7fd5c
parenta4b4433c511cf4361bb0afabba69e16632002d32
Merge remote-tracking branch 'leds/for-mm'

Conflicts:
drivers/leds/Kconfig