diff options
| author | Olof Johansson <olof@lixom.net> | 2020-01-06 09:33:53 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-01-06 09:33:53 -0800 |
| commit | 4081b335592a46d506e9ab5725ba8d7cd8cea1d9 (patch) | |
| tree | 3aed3118e0e16349fdc2c7619046bf3854270c3c /MAINTAINERS | |
| parent | 3b6930e82439895319bbd4fd5bf2d5b2a29f7915 (diff) | |
| parent | 0bc5f749bcb671547c8b126870bc60d06dcaccdf (diff) | |
| download | linux-stable-4081b335592a46d506e9ab5725ba8d7cd8cea1d9.tar.gz linux-stable-4081b335592a46d506e9ab5725ba8d7cd8cea1d9.tar.bz2 linux-stable-4081b335592a46d506e9ab5725ba8d7cd8cea1d9.zip | |
Merge branch 'mmp/hsic' into arm/dt
* mmp/hsic:
ARM: dts: mmp3-dell-ariel: Enable the HSIC
ARM: dts: mmp3: Add HSIC controllers
dt-bindings: phy: Add binding for marvell,mmp3-hsic-phy
clk: mmp2: Add HSIC clocks
dt-bindings: marvell,mmp2: Add clock ids for the HSIC clocks
+ Linux 5.5-rc2
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e6db3889cb19..b8403e2d2ef2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4971,6 +4971,7 @@ F: include/linux/dma-buf* F: include/linux/reservation.h F: include/linux/*fence.h F: Documentation/driver-api/dma-buf.rst +K: dma_(buf|fence|resv) T: git git://anongit.freedesktop.org/drm/drm-misc DMA GENERIC OFFLOAD ENGINE SUBSYSTEM @@ -12394,7 +12395,7 @@ L: linux-unionfs@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git S: Supported F: fs/overlayfs/ -F: Documentation/filesystems/overlayfs.txt +F: Documentation/filesystems/overlayfs.rst P54 WIRELESS DRIVER M: Christian Lamparter <chunkeey@googlemail.com> @@ -16315,12 +16316,10 @@ F: drivers/media/radio/radio-raremono.c THERMAL M: Zhang Rui <rui.zhang@intel.com> -M: Eduardo Valentin <edubezval@gmail.com> -R: Daniel Lezcano <daniel.lezcano@linaro.org> +M: Daniel Lezcano <daniel.lezcano@linaro.org> R: Amit Kucheria <amit.kucheria@verdurent.com> L: linux-pm@vger.kernel.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git -T: git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git Q: https://patchwork.kernel.org/project/linux-pm/list/ S: Supported F: drivers/thermal/ |