Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 27 May 2009 22:51:25 +0000 (15:51 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 May 2009 22:51:25 +0000 (15:51 -0700)
commit4d3383d0adb6d1047fb9ee3edd9dc05e4d2184f0
treeb9eabfb61d9b74d87e75c073c79edc92d9612ed8
parentb63dc8fef7ca5c51d163295d824e78c770d48ccf
parenteeff9beec3d2563c42cca41e66d4169592bb5475
Merge branch 'master' of git://git./linux/kernel/git/kaber/nf-2.6