]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mfd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Dec 2012 01:49:03 +0000 (12:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 5 Dec 2012 01:49:03 +0000 (12:49 +1100)
commite086448211b7f4a52569bf310e78c3ae55afae27
tree8fece0b86ba139fde6e8b22655d083d733b05654
parent67a9892ce5acff60cb9e260f209159d355131a72
parent709edecd4eaaa210ea9296c6d8ec5e9cedf1abe3
Merge remote-tracking branch 'mfd/for-next'

Conflicts:
drivers/input/touchscreen/ti_tscadc.c
drivers/mfd/twl-core.c
drivers/mmc/host/Kconfig
17 files changed:
drivers/base/regmap/internal.h
drivers/base/regmap/regmap.c
drivers/gpio/Kconfig
drivers/i2c/busses/Kconfig
drivers/i2c/busses/Makefile
drivers/input/misc/da9052_onkey.c
drivers/input/touchscreen/Kconfig
drivers/input/touchscreen/Makefile
drivers/input/touchscreen/da9052_tsi.c
drivers/mfd/arizona-core.c
drivers/mfd/stmpe.c
drivers/mfd/twl4030-irq.c
drivers/mfd/wm5102-tables.c
drivers/mfd/wm8994-core.c
drivers/mmc/host/Kconfig
drivers/mmc/host/Makefile
include/linux/regmap.h