From: Mark Brown Date: Fri, 10 Nov 2017 21:31:02 +0000 (+0000) Subject: Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ac97-mfd', 'asoc/topic... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=242f66c84533af20a20ecff4ea1b2c8c6a0f65ed;p=openwrt%2Fstaging%2Fblogic.git Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ac97-mfd', 'asoc/topic/amd' and 'asoc/topic/arizona-mfd' into asoc-next --- 242f66c84533af20a20ecff4ea1b2c8c6a0f65ed diff --cc MAINTAINERS index 2f4e462aa4a2,1c3feffb1c1c,2281af4b41b6,2d3d750b19c0,5824962f419f..761aa3c06360 --- a/MAINTAINERS +++ b/MAINTAINERS @@@@@@ -872,12 -840,6 -860,12 -872,12 -860,12 +872,12 @@@@@@ S: Supporte F: drivers/android/ F: drivers/staging/android/ + ANDROID GOLDFISH RTC DRIVER ---M: Miodrag Dinic ++++M: Miodrag Dinic + S: Supported + F: Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt + F: drivers/rtc/rtc-goldfish.c + ANDROID ION DRIVER M: Laura Abbott M: Sumit Semwal @@@@@@ -7570,17 -7446,6 -7558,17 -7570,17 -7558,17 +7570,17 @@@@@@ F: arch/mips/include/uapi/asm/kvm F: arch/mips/include/asm/kvm* F: arch/mips/kvm/ + KERNEL VIRTUAL MACHINE FOR POWERPC (KVM/powerpc) ---M: Alexander Graf ++++M: Paul Mackerras + L: kvm-ppc@vger.kernel.org + W: http://www.linux-kvm.org/ + T: git git://github.com/agraf/linux-2.6.git + S: Supported + F: arch/powerpc/include/uapi/asm/kvm* + F: arch/powerpc/include/asm/kvm* + F: arch/powerpc/kvm/ + F: arch/powerpc/kernel/kvm* + KERNEL VIRTUAL MACHINE for s390 (KVM/s390) M: Christian Borntraeger M: Cornelia Huck @@@@@@ -8599,22 -8421,9 -8581,16 -8599,22 -8581,16 +8599,22 @@@@@@ F: include/uapi/linux/meye. F: include/uapi/linux/ivtv* F: include/uapi/linux/uvcvideo.h + MEDIATEK CIR DRIVER + M: Sean Wang + S: Maintained + F: drivers/media/rc/mtk-cir.c + ++ +MEDIATEK PMIC LED DRIVER ++ +M: Sean Wang ++ +S: Maintained ++ +F: drivers/leds/leds-mt6323.c ++ +F: Documentation/devicetree/bindings/leds/leds-mt6323.txt ++ + MEDIATEK ETHERNET DRIVER M: Felix Fietkau - M: John Crispin + M: John Crispin + M: Sean Wang + M: Nelson Chang L: netdev@vger.kernel.org S: Maintained F: drivers/net/ethernet/mediatek/ @@@@@@ -8881,18 -8682,8 -8857,18 -8881,18 -8857,18 +8881,18 @@@@@@ F: drivers/leds/leds-menf21bmc. F: drivers/hwmon/menf21bmc_hwmon.c F: Documentation/hwmon/menf21bmc + MESON AO CEC DRIVER FOR AMLOGIC SOCS + M: Neil Armstrong + L: linux-media@lists.freedesktop.org + L: linux-amlogic@lists.infradead.org + W: http://linux-meson.com/ + S: Supported + F: drivers/media/platform/meson/ao-cec.c + F: Documentation/devicetree/bindings/media/meson-ao-cec.txt + T: git git://linuxtv.org/media_tree.git + METAG ARCHITECTURE -- -M: James Hogan ++ +M: James Hogan L: linux-metag@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git S: Odd Fixes @@@@@@ -9018,13 -8802,6 -8994,13 -9018,13 -8994,13 +9018,13 @@@@@@ F: arch/mips/include/asm/mach-loongson3 F: drivers/*/*loongson1* F: drivers/*/*/*loongson1* + MIPS RINT INSTRUCTION EMULATION ---M: Aleksandar Markovic ++++M: Aleksandar Markovic + L: linux-mips@linux-mips.org + S: Supported + F: arch/mips/math-emu/sp_rint.c + F: arch/mips/math-emu/dp_rint.c + MIROSOUND PCM20 FM RADIO RECEIVER DRIVER M: Hans Verkuil L: linux-media@vger.kernel.org @@@@@@ -10178,7 -9945,8 -10155,8 -10179,8 -10155,8 +10178,7 @@@@@@ F: include/uapi/linux/ppdev. F: Documentation/parport*.txt PARAVIRT_OPS INTERFACE - M: Jeremy Fitzhardinge - M: Chris Wright + M: Juergen Gross ---M: Chris Wright M: Alok Kataria M: Rusty Russell L: virtualization@lists.linux-foundation.org @@@@@@ -12934,13 -12642,6 -12912,13 -12935,13 -12912,13 +12934,13 @@@@@@ L: linux-mmc@vger.kernel.or S: Maintained F: drivers/mmc/host/dw_mmc* + SYNOPSYS HSDK RESET CONTROLLER DRIVER + M: Eugeniy Paltsev + S: Supported - -F: drivers/reset/reset-hsdk-v1.c - -F: include/dt-bindings/reset/snps,hsdk-v1-reset.h - -F: Documentation/devicetree/bindings/reset/snps,hsdk-v1-reset.txt ++ +F: drivers/reset/reset-hsdk.c ++ +F: include/dt-bindings/reset/snps,hsdk-reset.h ++ +F: Documentation/devicetree/bindings/reset/snps,hsdk-reset.txt + SYSTEM CONFIGURATION (SYSCON) M: Lee Jones M: Arnd Bergmann