diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-04 00:21:40 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-04 00:21:40 +0100 |
commit | d1ffa5669cd834f901141756e63195f48c1bfbf9 (patch) | |
tree | f0bed266c1f3fef528bbced56b48aac63e0a26b1 /MAINTAINERS | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | [PATCH] ocfs2: don't wait on recovery when locking journal (diff) | |
download | linux-d1ffa5669cd834f901141756e63195f48c1bfbf9.tar.xz linux-d1ffa5669cd834f901141756e63195f48c1bfbf9.zip |
Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e384eb7ef862..b6cbac5dbfd5 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 |