]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mfd-lj/for-mfd-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 03:26:37 +0000 (13:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 May 2014 03:26:37 +0000 (13:26 +1000)
commit9030b834e515b1204caf5bbe1a92e3bd4926e2ef
tree030277e3bafb318c77bf2c54ad4fb586325b395e
parentdcaa7ecb67b04946970d80e66384bf8760f876ce
parent9f9b201a97e99a491979b1d5ddd11f59aeca7a0a
Merge remote-tracking branch 'mfd-lj/for-mfd-next'

Conflicts:
drivers/mmc/host/rtsx_usb_sdmmc.c
drivers/i2c/busses/Kconfig
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/mfd/syscon.c