Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 17 Jul 2009 00:34:50 +0000 (17:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 17 Jul 2009 00:34:50 +0000 (17:34 -0700)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge