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	staging: board: Remove calls to of_genpd_get_from_provider()	2016-09-13 02:49:33 +02:00
clocking-wizard	staging: clocking-wizard: Fix incorrect type of speed grade	2016-10-25 09:54:32 +02:00
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	staging: emxx_udc: emxx_udc.c Align parenthesis	2016-11-23 10:05:39 +01:00
fbtft	staging: fbtft: Fix 'line over 80 characters'	2016-11-10 13:55:02 +01:00
fsl-mc	staging: fsl-mc: remove unnecessary info prints from bus driver	2016-12-08 21:00:08 +01:00
fwserial	Staging: fwserial: remove unused function fill_unplug_req	2016-10-16 10:25:09 +02:00
gdm724x	staging: gdm724x: Remove one blank line in sequence	2016-11-29 21:57:15 +01:00
goldfish	…
greybus	staging: greybus: timesync: validate platform state callback	2017-01-25 11:36:59 +01:00
gs_fpgaboot	Staging: gs_fpgaboot: Use octal permissions '0444'	2016-10-25 09:40:44 +02:00
i4l	staging: i4l: pcbit: remove duplicated include from capi.c	2016-10-25 09:59:48 +02:00
iio	staging: iio: tsl2583: move out of staging	2016-11-13 13:07:33 +00:00
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	staging: most: Eliminate usage of symbolic permissions	2016-11-29 21:57:14 +01:00
mt29f_spinand	…
netlogic	net: Remove usage of net_device last_rx member	2017-01-18 17:22:49 -05:00
nvec	staging: nvec: remove managed resource from PS2 driver	2016-11-07 11:48:25 +01:00
octeon	drivers: net: generalize napi_complete_done()	2017-01-30 15:10:42 -05:00
octeon-usb	staging: octeon-usb: Remove unnecessary assignment	2016-09-22 11:54:48 +02:00
olpc_dcon	Revert "staging: olpc_dcon: Replace a bit shift by a use of BIT."	2016-09-18 13:09:50 +02:00
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	staging: rts5208: rtsx.c: Fix invalid use of sizeof in rtsx_probe()	2016-10-25 09:59:48 +02:00
skein	staging: skein: threefish_block.c Remove blank lines	2016-11-21 11:10:56 +01:00
sm750fb	staging: sm750fb: fix tabstop style warning	2016-11-30 12:59:53 +01:00
speakup	staging: speakup: speakup_soft.c Align parenthesis	2016-11-23 10:07:32 +01:00
unisys	drivers: net: generalize napi_complete_done()	2017-01-30 15:10:42 -05:00
vc04_services	staging: vc04_services: add HAS_DMA dependancy	2016-11-17 09:39:59 +01:00
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	staging: vt6656: Fix coding style warnings on Block comments	2016-11-21 11:13:14 +01:00
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	staging: xgifb: XGI_main.h Align data columns	2016-11-19 14:17:51 +01:00
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