diff options
| author | Chris Mason <chris.mason@oracle.com> | 2009-01-28 20:29:43 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-01-28 20:29:43 -0500 |
| commit | e4f722fa42537bcb0ff14322a57dc3870d093cab (patch) | |
| tree | 315920ade3b68bf20c4080bcd1bf2bc34a5d5ab7 /MAINTAINERS | |
| parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
| parent | a717531942f488209dded30f6bc648167bcefa72 (diff) | |
| download | linux-e4f722fa42537bcb0ff14322a57dc3870d093cab.tar.gz linux-e4f722fa42537bcb0ff14322a57dc3870d093cab.tar.bz2 linux-e4f722fa42537bcb0ff14322a57dc3870d093cab.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
Fix fs/btrfs/super.c conflict around #includes
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d992d407197b..8a7b0b36e8b4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 |