Conflicts:
	drivers/net/usb/r8152.c
	net/netfilter/nfnetlink.c

Both r8152 and nfnetlink conflicts were simple overlapping changes.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>