mirror of
https://github.com/torvalds/linux.git
synced 2026-01-25 15:03:52 +08:00
Conflicts: drivers/net/usb/r8152.c net/netfilter/nfnetlink.c Both r8152 and nfnetlink conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>