diff options
| author |   David S. Miller <davem@davemloft.net> | 2012-11-16 12:42:43 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-16 12:42:43 -0500 |
| commit | 545b29019c8959c805abfe8194d47e989f1a6e5f (patch) | |
| tree | 120f88abf0b4b2317072579c667fddfccb930fe5 /arch/ia64 | |
| parent | ipv6: export IP6_RT_PRIO_* to userland (diff) | |
| parent | netfilter: ipv6: only provide sk_bound_dev_if for link-local addr (diff) | |
| download | linux-dev-545b29019c8959c805abfe8194d47e989f1a6e5f.tar.xz linux-dev-545b29019c8959c805abfe8194d47e989f1a6e5f.zip | |
Merge branch 'master' of git://1984.lsi.us.es/nf-next
Conflicts:
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
Minor conflict due to some IS_ENABLED conversions done
in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/ia64')
0 files changed, 0 insertions, 0 deletions