summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-03 15:21:40 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-03 15:21:40 -0800
commitd1ffa5669cd834f901141756e63195f48c1bfbf9 (patch)
treef0bed266c1f3fef528bbced56b48aac63e0a26b1 /MAINTAINERS
parentd6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f (diff)
parent6eff5790d57a5c9c01489c95946881808a4b2a2c (diff)
downloadlinux-3.10-d1ffa5669cd834f901141756e63195f48c1bfbf9.tar.gz
linux-3.10-d1ffa5669cd834f901141756e63195f48c1bfbf9.tar.bz2
linux-3.10-d1ffa5669cd834f901141756e63195f48c1bfbf9.zip
Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e384eb7ef86..b6cbac5dbfd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -557,7 +557,8 @@ S: Supported
CONFIGFS
P: Joel Becker
-M: Joel Becker <joel.becker@oracle.com>
+M: joel.becker@oracle.com
+L: linux-kernel@vger.kernel.org
S: Supported
CIRRUS LOGIC GENERIC FBDEV DRIVER