diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-02-09 09:34:45 -0600 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-09 09:34:45 -0600 |
| commit | d41d4113f49e16bfab02eff0248282200be21807 (patch) | |
| tree | ae84803c22a09f138023ef62de73712f324bc62d /MAINTAINERS | |
| parent | b58a4cc51f4f569c6a86979890f9b237a504ab6b (diff) | |
| parent | d5b562330ec766292a3ac54ae5e0673610bd5b3d (diff) | |
| download | talos-obmc-linux-d41d4113f49e16bfab02eff0248282200be21807.tar.gz talos-obmc-linux-d41d4113f49e16bfab02eff0248282200be21807.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d23851bf81f7..45eac292d030 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -911,7 +911,7 @@ S: Maintained BLACKFIN ARCHITECTURE P: Bryan Wu M: cooloney@kernel.org -L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) +L: uclinux-dist-devel@blackfin.uclinux.org W: http://blackfin.uclinux.org S: Supported @@ -1021,6 +1021,14 @@ M: mb@bu3sch.de W: http://bu3sch.de/btgpio.php S: Maintained +BTRFS FILE SYSTEM +P: Chris Mason +M: chris.mason@oracle.com +L: linux-btrfs@vger.kernel.org +W: http://btrfs.wiki.kernel.org/ +T: git kernel.org:/pub/scm/linux/kernel/git/mason/btrfs-unstable.git +S: Maintained + BTTV VIDEO4LINUX DRIVER P: Mauro Carvalho Chehab M: mchehab@infradead.org @@ -2212,7 +2220,7 @@ P: Sean Hefty M: sean.hefty@intel.com P: Hal Rosenstock M: hal.rosenstock@gmail.com -L: general@lists.openfabrics.org +L: general@lists.openfabrics.org (moderated for non-subscribers) W: http://www.openib.org/ T: git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git S: Supported @@ -4841,6 +4849,7 @@ P: Ingo Molnar M: mingo@redhat.com P: H. Peter Anvin M: hpa@zytor.com +M: x86@kernel.org L: linux-kernel@vger.kernel.org T: git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git S: Maintained |
