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

A bug fix overlapped with changing how the netback SKB control
block is implemented.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>