drivers/net/phy/phy.c · 1e1cdf8ac78793e0875465e98a648df64694a8d0 · SECO Northern Europe / Kernel / linux-guf

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

David S. Miller authored 11 years ago


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

Both the r8152 and netback conflicts were simple overlapping
changes.

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

85dcce7a

Code owners

Assign users and groups as approvers for specific file changes. Learn more.