]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mfd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:51:04 +0000 (13:51 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:51:04 +0000 (13:51 +1000)
commita3c5c9ea6a337471d16e6c626e744046713cd417
tree21a3c1b7c3d4452f8b19288ebff73cbcb9419fcc
parent13a60bdace564050dc63e047738306407fc43123
parente9bea82c60d77d145ea370f710fd82407846f951
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
drivers/gpio/Makefile
drivers/mfd/Makefile
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/mfd/twl-core.c
drivers/regulator/Kconfig
include/linux/mfd/tps65910.h