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
..
e1000	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
e1000e	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
fm10k	treewide: Use array_size() in vmalloc()	2018-06-12 16:19:22 -07:00
i40e	xdp: don't make drivers report attachment mode	2018-07-13 20:26:35 +02:00
i40evf	net: sched: pass extack pointer to block binds and cb registration	2018-06-26 23:21:32 +09:00
ice	ice: Update NVM AQ command functions	2018-05-17 09:14:09 -07:00
igb	igb: Add support for ETF offload	2018-07-04 22:30:28 +09:00
igbvf	net: intel: Cleanup the copyright/license headers	2018-04-27 14:00:04 -04:00
ixgb	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
ixgbe	Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux	2018-07-20 21:17:12 -07:00
ixgbevf	xdp: don't make drivers report attachment mode	2018-07-13 20:26:35 +02:00
e100.c	net: intel: Cleanup the copyright/license headers	2018-04-27 14:00:04 -04:00
Kconfig	docs: Fix more broken references	2018-06-15 18:11:26 -03:00
Makefile	ice: Add basic driver framework for Intel(R) E800 Series	2018-03-26 08:28:02 -07:00