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)
commit95aa1fe4abfc8d75dcd110bb285b09740214d053
tree668998047f77fe5d7f76ecbceec73a4f4c8311a6
parentb13bb2e9933b9dfa25c81d959d847c843481111e
parent941297f443f871b8c3372feccf27a8733f6ce9e9
Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-2.6
MAINTAINERS