tree 61902c09bfa14034a82c151f46a4616a2f013653
parent ce22bb6122e849e0d3a6857d03eb69a25bfdc6e9
parent 17e84a9253467552fb06f99c009bb0bc1d7bfd39
author David S. Miller <davem@davemloft.net> 1396299403 -0400
committer David S. Miller <davem@davemloft.net> 1396299403 -0400

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

Conflicts:
	drivers/net/xen-netback/netback.c

A bug fix overlapped with changing how the netback SKB control
block is implemented.

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