diff --git a/[refs] b/[refs] index 69f7a4c20885..9be7185e8c8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63ca8ce2a2641f9cb5f0add33ced4591681d1cd7 +refs/heads/master: 0ad122d901977890de554fdd3ff65474efc1a9bf diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 4cbf6016a9b9..03c5d6ccb9f8 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3123,6 +3123,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