David S. Miller 3efa70d78f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-02-07 16:29:30 -05:00
..
android	mm: use vmf->address instead of of vmf->virtual_address	2016-12-14 16:04:09 -08:00
board
clocking-wizard
comedi	staging: comedi: comedidev.h: Document usage of 'detach' handler	2016-12-08 21:01:23 +01:00
dgnc	staging: dgnc: Fix lines longer than 80 characters	2016-12-07 11:41:17 +01:00
emxx_udc
fbtft
fsl-mc	staging: fsl-mc: remove unnecessary info prints from bus driver	2016-12-08 21:00:08 +01:00
fwserial
gdm724x
goldfish
greybus	staging: greybus: timesync: validate platform state callback	2017-01-25 11:36:59 +01:00
gs_fpgaboot
i4l
iio
ks7010	net: Remove usage of net_device last_rx member	2017-01-18 17:22:49 -05:00
lustre	staging/lustre/libcfs: Convert to hotplug state machine	2016-12-25 10:47:43 +01:00
media	media updates for v4.10-rc1	2016-12-16 09:39:16 -08:00
most
mt29f_spinand
netlogic	net: Remove usage of net_device last_rx member	2017-01-18 17:22:49 -05:00
nvec
octeon	drivers: net: generalize napi_complete_done()	2017-01-30 15:10:42 -05:00
octeon-usb
olpc_dcon
rtl8188eu	Makefile: drop -D__CHECK_ENDIAN__ from cflags	2016-12-16 00:13:43 +02:00
rtl8192e	net: Remove usage of net_device last_rx member	2017-01-18 17:22:49 -05:00
rtl8192u	net: Remove usage of net_device last_rx member	2017-01-18 17:22:49 -05:00
rtl8712	Staging:rtl8712: Fixed coding style issue	2016-12-06 10:18:07 +01:00
rts5208
skein
sm750fb
speakup
unisys	drivers: net: generalize napi_complete_done()	2017-01-30 15:10:42 -05:00
vc04_services
vme	Staging/IIO patches for 4.10-rc1	2016-12-13 11:35:00 -08:00
vt6655	staging: vt6655: Add spaces around +	2016-12-06 10:18:07 +01:00
vt6656
wilc1000	Staging/IIO patches for 4.10-rc1	2016-12-13 11:35:00 -08:00
wlan-ng	net: Remove usage of net_device last_rx member	2017-01-18 17:22:49 -05:00
xgifb
Kconfig	staging: slicoss: remove the staging driver	2016-12-06 18:18:30 +01:00
Makefile	staging: slicoss: remove the staging driver	2016-12-06 18:18:30 +01:00