diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-27 07:47:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-27 07:47:34 +0200 |
| commit | 003263f45b8aa5466afe0209f75a077c50e8f477 (patch) | |
| tree | 7103d7f23e88fcdc301928bb157f6ef595c31c21 /MAINTAINERS | |
| parent | 12f50da2e1ad0cda2fb5754298bd03b3b02eb78b (diff) | |
| parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) | |
Merge branch 'linus' into kmemcheck
Conflicts:
init/main.c
mm/slab.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 75321a64d50b..96fc7c8eecb6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3131,6 +3131,12 @@ W: http://oss.oracle.com/projects/ocfs2/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git S: Supported +OMFS FILESYSTEM +P: Bob Copeland +M: me@bobcopeland.com +L: linux-karma-devel@lists.sourceforge.net +S: Maintained + OMNIKEY CARDMAN 4000 DRIVER P: Harald Welte M: laforge@gnumonks.org |