diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-09-03 15:28:30 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-09-03 15:34:51 +0200 |
| commit | ace1fe1231bdfffd60b5e703aa5b7283fbf98dbd (patch) | |
| tree | 06c7492a8f3cc65f916768616ca24c6bc7171761 /drivers/net/ethernet/marvell | |
| parent | netfilter: properly annotate ipv4_netfilter_{init,fini}() (diff) | |
| parent | 6lowpan: handle NETDEV_UNREGISTER event (diff) | |
| download | linux-ace1fe1231bdfffd60b5e703aa5b7283fbf98dbd.tar.xz linux-ace1fe1231bdfffd60b5e703aa5b7283fbf98dbd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
This merges (3f509c6 netfilter: nf_nat_sip: fix incorrect handling
of EBUSY for RTCP expectation) to Patrick McHardy's IPv6 NAT changes.
Diffstat (limited to 'drivers/net/ethernet/marvell')
0 files changed, 0 insertions, 0 deletions