diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /MAINTAINERS | |
parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c4fb13f59f3d..9f926c0229db 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -6916,6 +6916,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86. | |||
6916 | S: Maintained | 6916 | S: Maintained |
6917 | F: drivers/platform/x86 | 6917 | F: drivers/platform/x86 |
6918 | 6918 | ||
6919 | XEN NETWORK BACKEND DRIVER | ||
6920 | M: Ian Campbell <ian.campbell@citrix.com> | ||
6921 | L: xen-devel@lists.xensource.com (moderated for non-subscribers) | ||
6922 | L: netdev@vger.kernel.org | ||
6923 | S: Supported | ||
6924 | F: drivers/net/xen-netback/* | ||
6925 | |||
6919 | XEN PCI SUBSYSTEM | 6926 | XEN PCI SUBSYSTEM |
6920 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 6927 | M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> |
6921 | L: xen-devel@lists.xensource.com (moderated for non-subscribers) | 6928 | L: xen-devel@lists.xensource.com (moderated for non-subscribers) |