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)
commit785824165508a65478474f0c87f6b8c3ad048c62
tree2b3ef81b4439cf682638aa504e29f37ef2b6da96
parentec0506dbe4e240ecd4c32bf74c84a88ce1ddb414
parent768b1031dc9f3eabe3e9f603e33617a0215c12a8
Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-2.6
MAINTAINERS