David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ... All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-20 21:17:12 -07:00
..
Kconfig	net: ethernet: Add missing VENDOR to Cadence and Packet Engines symbols	2018-07-05 20:05:54 +09:00
macb_main.c	net: macb: Allocate valid memory for TX and RX BD prefetch	2018-07-07 20:54:25 +09:00
macb_pci.c	net: cadence: macb: constify pci_device_id.	2017-07-17 13:37:15 -07:00
macb_ptp.c	net: macb: Fix ptp time adjustment for large negative delta	2018-06-21 15:01:06 +09:00
macb.h	net: macb: Allocate valid memory for TX and RX BD prefetch	2018-07-07 20:54:25 +09:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00