Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 30 Aug 2011 21:43:56 +0000 (17:43 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 30 Aug 2011 21:43:56 +0000 (17:43 -0400)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge