WSL2-Linux-Kernel/drivers/staging
David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/geneve.c

Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-12-17 22:08:28 -05:00
..
android Revert "scatterlist: use sg_phys()" 2015-12-15 12:54:06 -08:00
board staging: board: Set PM domain before probe 2015-10-29 09:05:57 +09:00
clocking-wizard
comedi staging: comedi: comedi_test: implement commands on AO subdevice 2015-10-29 08:58:36 +09:00
dgap
dgnc
emxx_udc
fbtft spi: Updates for v4.4 2015-11-05 13:15:12 -08:00
fsl-mc
fwserial
gdm72xx
gdm724x
goldfish
gs_fpgaboot
iio staging: iio: dummy: complete IIO events delivery to userspace 2015-11-21 15:56:44 +00:00
lustre Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-12-17 22:08:28 -05:00
media media updates for v4.4-rc1 2015-11-05 12:05:15 -08:00
most staging: most: remove exclusive wait_queue 2015-10-29 08:57:19 +09:00
mt29f_spinand MTD updates for 4.4-rc1: 2015-11-06 11:50:24 -08:00
netlogic
nvec
octeon
octeon-usb
olpc_dcon
panel
rdma Merge branch 'akpm' (patches from Andrew) 2015-11-07 14:32:45 -08:00
rtl8188eu staging: rtl8188eu: pwrGrpCnt variable removed in store_pwrindex_offset function 2015-10-29 09:09:08 +09:00
rtl8192e
rtl8192u Staging: rtl8192u: ieee80211: added missing blank lines 2015-10-29 09:10:55 +09:00
rtl8712
rtl8723au
rts5208
skein
slicoss
sm750fb
speakup Staging driver update for 4.4-rc1 2015-11-04 21:40:53 -08:00
ste_rmi4
unisys
vme
vt6655
vt6656
wilc1000 Revert "Staging: wilc1000: coreconfigurator: Drop unneeded wrapper functions" 2015-11-18 13:22:44 -08:00
wlan-ng drivers:staging:wlan_ng Fix no space is necessary after a cast 2015-10-29 09:05:57 +09:00
xgifb
Kconfig
Makefile
staging.c