diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-26 18:04:59 -0400 |
| commit | d9ecdb282c91952796b7542c4f57fd6de6948d7b (patch) | |
| tree | fd4de7923968afa7d2981fb037e2255fc2cfa1e1 /MAINTAINERS | |
| parent | 4ef584ba84125b67c17b5aded38e7783cd8cdef0 (diff) | |
| parent | 1d1f8b377c48e5aeddaea52eba74cc0539f088cd (diff) | |
Merge branch 'for_rmk_13' of git://git.mnementh.co.uk/linux-2.6-im
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4cbf6016a9b9..03c5d6ccb9f8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3123,6 +3123,12 @@ W: http://oss.oracle.com/projects/ocfs2/ | |||
| 3123 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git | 3123 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git |
| 3124 | S: Supported | 3124 | S: Supported |
| 3125 | 3125 | ||
| 3126 | OMFS FILESYSTEM | ||
| 3127 | P: Bob Copeland | ||
| 3128 | M: me@bobcopeland.com | ||
| 3129 | L: linux-karma-devel@lists.sourceforge.net | ||
| 3130 | S: Maintained | ||
| 3131 | |||
| 3126 | OMNIKEY CARDMAN 4000 DRIVER | 3132 | OMNIKEY CARDMAN 4000 DRIVER |
| 3127 | P: Harald Welte | 3133 | P: Harald Welte |
| 3128 | M: laforge@gnumonks.org | 3134 | M: laforge@gnumonks.org |