]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 24 Mar 2015 02:22:43 +0000 (22:22 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Mar 2015 02:22:43 +0000 (22:22 -0400)
commit0b4fe07c9f40db5954f57385665c45f254d95616
treec04fca1719409426b42af6a7caa75cc26ba940a9
parentf7ec0e2f78dcfad7c0716b3ac2482fd4164a5223
parent1b57f36f5493f4f756d803b1d442f25ad6ed160d
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
net/netfilter/nf_tables_core.c

The nf_tables_core.c conflict was resolved using a conflict resolution
from Stephen Rothwell as a guide.

Signed-off-by: David S. Miller <davem@davemloft.net>
MAINTAINERS
net/netfilter/nf_tables_api.c
net/netfilter/nft_compat.c
net/netfilter/nft_hash.c
net/netfilter/xt_TPROXY.c