]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'mfd-lj/for-mfd-next'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:36:49 +0000 (14:36 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 12:36:49 +0000 (14:36 +0200)
Conflicts:
sound/soc/codecs/mc13783.c

1  2 
drivers/mfd/tps65910.c
drivers/mfd/twl6040.c

Simple merge
Simple merge