David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <[email protected]>

2016-02-23 00:09:14 -05:00

..

fault-injection

…

ktest

ktest: Place quotes around item variable

2015-02-03 15:45:13 -05:00

nvdimm

phys_to_pfn_t: use phys_addr_t

2016-01-31 09:10:19 -08:00

selftests

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

2016-02-23 00:09:14 -05:00