diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2017-11-03 22:10:18 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-11-03 22:10:18 +0800 |
commit | ab387f0af24e661fc1c2f609664ec9ae6618e3f0 (patch) | |
tree | 6254d174314b1bcce11ce28f1aadf0df93e25d8e /MAINTAINERS | |
parent | e666d4e9ceec94c0a88c94b7db31d56474da43b3 (diff) | |
parent | 9e66317d3c92ddaab330c125dfe9d06eee268aff (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge 4.14-rc3 in order to pick up the new timer_setup function.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bb3016c2c342..c8cd4173ee7b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -352,6 +352,18 @@ L: linux-acpi@vger.kernel.org S: Maintained F: drivers/acpi/arm64 +ACPI PMIC DRIVERS +M: "Rafael J. Wysocki" <rjw@rjwysocki.net> +M: Len Brown <lenb@kernel.org> +R: Andy Shevchenko <andy@infradead.org> +R: Mika Westerberg <mika.westerberg@linux.intel.com> +L: linux-acpi@vger.kernel.org +Q: https://patchwork.kernel.org/project/linux-acpi/list/ +T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm +B: https://bugzilla.kernel.org +S: Supported +F: drivers/acpi/pmic/ + ACPI THERMAL DRIVER M: Zhang Rui <rui.zhang@intel.com> L: linux-acpi@vger.kernel.org @@ -2853,7 +2865,6 @@ S: Supported F: drivers/scsi/bnx2i/ BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER -M: Yuval Mintz <Yuval.Mintz@cavium.com> M: Ariel Elior <ariel.elior@cavium.com> M: everest-linux-l2@cavium.com L: netdev@vger.kernel.org @@ -6643,8 +6654,8 @@ M: Alexander Aring <alex.aring@gmail.com> M: Stefan Schmidt <stefan@osg.samsung.com> L: linux-wpan@vger.kernel.org W: http://wpan.cakelab.org/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git -T: git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next.git S: Maintained F: net/ieee802154/ F: net/mac802154/ @@ -8586,6 +8597,12 @@ M: Sean Wang <sean.wang@mediatek.com> S: Maintained F: drivers/media/rc/mtk-cir.c +MEDIATEK PMIC LED DRIVER +M: Sean Wang <sean.wang@mediatek.com> +S: Maintained +F: drivers/leds/leds-mt6323.c +F: Documentation/devicetree/bindings/leds/leds-mt6323.txt + MEDIATEK ETHERNET DRIVER M: Felix Fietkau <nbd@openwrt.org> M: John Crispin <john@phrozen.org> @@ -11047,7 +11064,6 @@ S: Supported F: drivers/scsi/qedi/ QLOGIC QL4xxx ETHERNET DRIVER -M: Yuval Mintz <Yuval.Mintz@cavium.com> M: Ariel Elior <Ariel.Elior@cavium.com> M: everest-linux-l2@cavium.com L: netdev@vger.kernel.org |