diff --git a/[refs] b/[refs] index 441a501c0396..8d3fa7009041 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19d00cc196a3a66fd074f62b39d219f743b92338 +refs/heads/master: eb1eb04fdfbd9e1c9c40d072ab1b82fe593eeb0f diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index fbc8fa58d56d..e1b74261260b 100644 --- a/trunk/MAINTAINERS +++ b/trunk/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