diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-09 10:13:01 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-09 10:13:01 +0300 |
| commit | 355a73f07d1da405728c9e57afd6eede340788f4 (patch) | |
| tree | bca9d993a19c9cf0940231323ad74fbec605b044 /MAINTAINERS | |
| parent | 197f4d6a4a00915b29fa7ec71f8010b9c763e676 (diff) | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
| download | linux-355a73f07d1da405728c9e57afd6eede340788f4.tar.xz | |
Merge 4.0-rc3 into staging-next
We want the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index db15919dbf1c..65f16e4be9d1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2065,7 +2065,7 @@ F: include/net/bluetooth/ BONDING DRIVER M: Jay Vosburgh <j.vosburgh@gmail.com> M: Veaceslav Falico <vfalico@gmail.com> -M: Andy Gospodarek <andy@greyhouse.net> +M: Andy Gospodarek <gospo@cumulusnetworks.com> L: netdev@vger.kernel.org W: http://sourceforge.net/projects/bonding/ S: Supported @@ -7219,8 +7219,7 @@ ORACLE CLUSTER FILESYSTEM 2 (OCFS2) M: Mark Fasheh <mfasheh@suse.com> M: Joel Becker <jlbec@evilplan.org> L: ocfs2-devel@oss.oracle.com (moderated for non-subscribers) -W: http://oss.oracle.com/projects/ocfs2/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git +W: http://ocfs2.wiki.kernel.org S: Supported F: Documentation/filesystems/ocfs2.txt F: Documentation/filesystems/dlmfs.txt @@ -8487,6 +8486,14 @@ S: Supported L: netdev@vger.kernel.org F: drivers/net/ethernet/samsung/sxgbe/ +SAMSUNG THERMAL DRIVER +M: Lukasz Majewski <l.majewski@samsung.com> +L: linux-pm@vger.kernel.org +L: linux-samsung-soc@vger.kernel.org +S: Supported +T: https://github.com/lmajewski/linux-samsung-thermal.git +F: drivers/thermal/samsung/ + SAMSUNG USB2 PHY DRIVER M: Kamil Debski <k.debski@samsung.com> L: linux-kernel@vger.kernel.org |