diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-09 15:39:11 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-09 15:39:11 -0500 |
| commit | bb1d3034449ed08e2ffbf5813a5ad9fa30475359 (patch) | |
| tree | a48cc17fc4683b5fdc1656ac71639540bd8852e2 /MAINTAINERS | |
| parent | 3b647be2bfcd95d6d0feba245ccc3966c73ccc52 (diff) | |
| parent | 811a919135b980bac8009d042acdccf10dc1ef5e (diff) | |
| download | linux-bb1d3034449ed08e2ffbf5813a5ad9fa30475359.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 21edaedcab46..d42a37a351f8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3806,6 +3806,7 @@ F: include/linux/devcoredump.h DEVICE FREQUENCY (DEVFREQ) M: MyungJoo Ham <myungjoo.ham@samsung.com> M: Kyungmin Park <kyungmin.park@samsung.com> +R: Chanwoo Choi <cw00.choi@samsung.com> L: linux-pm@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git S: Maintained @@ -5512,6 +5513,7 @@ M: Alex Elder <elder@kernel.org> M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> S: Maintained F: drivers/staging/greybus/ +L: greybus-dev@lists.linaro.org GREYBUS AUDIO PROTOCOLS DRIVERS M: Vaibhav Agarwal <vaibhav.sr@gmail.com> @@ -5969,6 +5971,7 @@ F: drivers/media/platform/sti/hva Hyper-V CORE AND DRIVERS M: "K. Y. Srinivasan" <kys@microsoft.com> M: Haiyang Zhang <haiyangz@microsoft.com> +M: Stephen Hemminger <sthemmin@microsoft.com> L: devel@linuxdriverproject.org S: Maintained F: arch/x86/include/asm/mshyperv.h @@ -9855,7 +9858,7 @@ M: Mark Rutland <mark.rutland@arm.com> M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> L: linux-arm-kernel@lists.infradead.org S: Maintained -F: drivers/firmware/psci.c +F: drivers/firmware/psci*.c F: include/linux/psci.h F: include/uapi/linux/psci.h |