tree c04fca1719409426b42af6a7caa75cc26ba940a9
parent ba7c95ea3870fe7b847466d39a049ab6f156aa2c
parent 90a5a895cc8b284ac522757a01de15e36710c2b9
author David S. Miller <davem@davemloft.net> 1427163763 -0400
committer David S. Miller <davem@davemloft.net> 1427163763 -0400

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>