| commit | 545b29019c8959c805abfe8194d47e989f1a6e5f | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Nov 16 12:42:43 2012 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Fri Nov 16 12:42:43 2012 -0500 |
| tree | 120f88abf0b4b2317072579c667fddfccb930fe5 | |
| parent | 130cd273d4a46a3011b1cc739f5d2af78779d666 [diff] | |
| parent | d3976a53ce1f4763cb910d047e8763e4c696e5f7 [diff] |
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>