]> git.karo-electronics.de Git - karo-tx-linux.git/commit - drivers/media/usb/gspca/gspca.c
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)
commit297426405efae51dcf90bea618b81818153581e6
treea0217a24bf41db58372e72bf5af9275397e8d844
parent7fbb4d4548bd8d2d0a2ce1d87df77e16ad8c9b3e
parent6bfd1e63de34a278d67db32e3644340838308252
Merge remote-tracking branch 'mfd-lj/for-mfd-next'

Conflicts:
sound/soc/codecs/mc13783.c
drivers/mfd/tps65910.c
drivers/mfd/twl6040.c