OSDN Git Service

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)
commitd5c1d8c567781932e3ab2c62e8fcfee0283d9580
treec04fca1719409426b42af6a7caa75cc26ba940a9
parentba7c95ea3870fe7b847466d39a049ab6f156aa2c
parent90a5a895cc8b284ac522757a01de15e36710c2b9
Merge git://git./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