diff options
| author |   David S. Miller <davem@davemloft.net> | 2014-06-05 16:22:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-05 16:22:02 -0700 |
| commit | f666f87b9423fb534d2116206ace04495080f2b5 (patch) | |
| tree | 23f929c890219d6ef412b4ff630adf501b70a3ec /net/ipv4/netfilter/nf_defrag_ipv4.c | |
| parent | net: phy: fix sparse warning in fixed.c (diff) | |
| parent | net: filter: fix SKF_AD_PKTTYPE extension on big-endian (diff) | |
| download | linux-dev-f666f87b9423fb534d2116206ace04495080f2b5.tar.xz linux-dev-f666f87b9423fb534d2116206ace04495080f2b5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/xen-netback/netback.c
net/core/filter.c
A filter bug fix overlapped some cleanups and a conversion
over to some new insn generation macros.
A xen-netback bug fix overlapped the addition of multi-queue
support.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/netfilter/nf_defrag_ipv4.c')
0 files changed, 0 insertions, 0 deletions