diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 18:21:40 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 18:21:40 -0500 |
| commit | d1ffa5669cd834f901141756e63195f48c1bfbf9 (patch) | |
| tree | f0bed266c1f3fef528bbced56b48aac63e0a26b1 /MAINTAINERS | |
| parent | d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f (diff) | |
| parent | 6eff5790d57a5c9c01489c95946881808a4b2a2c (diff) | |
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 | |||
| 557 | 557 | ||
| 558 | CONFIGFS | 558 | CONFIGFS |
| 559 | P: Joel Becker | 559 | P: Joel Becker |
| 560 | M: Joel Becker <joel.becker@oracle.com> | 560 | M: joel.becker@oracle.com |
| 561 | L: linux-kernel@vger.kernel.org | ||
| 561 | S: Supported | 562 | S: Supported |
| 562 | 563 | ||
| 563 | CIRRUS LOGIC GENERIC FBDEV DRIVER | 564 | CIRRUS LOGIC GENERIC FBDEV DRIVER |