tree 3558f68717c70a67e18c3274bb17709a353d036f
parent 30129cf28a5c99f9cb7c168f0d280f147fd6cc8b
parent 3da889b616164bde76a37350cf28e0d17a94e979
author David S. Miller <davem@davemloft.net> 1363081942 -0400
committer David S. Miller <davem@davemloft.net> 1363081942 -0400

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	drivers/net/ethernet/intel/e1000e/netdev.c

Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.

Signed-off-by: David S. Miller <davem@davemloft.net>