From: Mark Brown Date: Wed, 7 Oct 2015 15:07:16 +0000 (+0100) Subject: Merge remote-tracking branches 'asoc/fix/db1200', 'asoc/fix/dwc', 'asoc/fix/imx-ssi... X-Git-Tag: drm-fsl-dcu-for-next~2340^2~4^2~1 X-Git-Url: http://git.agner.ch/gitweb/?p=linux-drm-fsl-dcu.git;a=commitdiff_plain;h=1e2fa4cfdbf21b3c071e0d9739dce5aac9edcb85 Merge remote-tracking branches 'asoc/fix/db1200', 'asoc/fix/dwc', 'asoc/fix/imx-ssi', 'asoc/fix/maintainers', 'asoc/fix/rt5645', 'asoc/fix/sgtl5000' and 'asoc/fix/tas2552' into asoc-linus --- 1e2fa4cfdbf21b3c071e0d9739dce5aac9edcb85 diff --cc MAINTAINERS index 797236befd27,7ba7ab749c85,7ba7ab749c85,7ba7ab749c85,07790dfa22c5,7ba7ab749c85,7ba7ab749c85,7ba7ab749c85..60aacd88bd7f --- a/MAINTAINERS +++ b/MAINTAINERS @@@@@@@@@ -11378,19 -11364,21 -11364,21 -11364,21 -11363,10 -11364,21 -11364,21 -11364,21 +11378,10 @@@@@@@@@ W: http://oops.ghostprotocols.net:81/bl S: Maintained F: drivers/net/wireless/wl3501* ---- ---WM97XX TOUCHSCREEN DRIVERS ---- ---M: Mark Brown ---- ---M: Liam Girdwood ---- ---L: linux-input@vger.kernel.org - W: https://github.com/CirrusLogic/linux-drivers/wiki --- ---T: git git://opensource.wolfsonmicro.com/linux-2.6-touch --- ---W: http://opensource.wolfsonmicro.com/node/7 ---- ---S: Supported ---- ---F: drivers/input/touchscreen/*wm97* ---- ---F: include/linux/wm97xx.h ---- --- WOLFSON MICROELECTRONICS DRIVERS L: patches@opensource.wolfsonmicro.com --- ---T: git git://opensource.wolfsonmicro.com/linux-2.6-asoc --- ---T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus --- ---W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices +++ +++T: git https://github.com/CirrusLogic/linux-drivers.git +++ +++W: https://github.com/CirrusLogic/linux-drivers/wiki S: Supported F: Documentation/hwmon/wm83?? F: arch/arm/mach-s3c64xx/mach-crag6410*