OpenCloudOS-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 staging: dgap: add spaces around binary operator '|' 2015-10-24 19:33:42 -07:00
dgnc staging: dgnc: dgnc_driver: Remove useless initialisation 2015-10-16 22:56:23 -07:00
emxx_udc Staging: emxx_udc: Add space around operator. 2015-10-24 19:21:05 -07:00
fbtft spi: Updates for v4.4 2015-11-05 13:15:12 -08:00
fsl-mc staging: fsl-mc: section mismatch bug fix 2015-10-27 14:40:14 +09:00
fwserial
gdm72xx Staging: gdm72xx: Remove unnecessary cast on void pointer 2015-10-16 22:51:48 -07:00
gdm724x staging: gdm724x: remove multiple blank lines 2015-10-24 19:02:42 -07:00
goldfish staging: goldfish: Prefer kernel type u32 over uint32_t 2015-09-12 18:24:38 -07:00
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 staging: netlogic: Do not use multiple blank lines. 2015-10-24 19:38:48 -07:00
nvec staging: nvec: Do not use multiple blank lines. 2015-10-27 14:49:09 +09:00
octeon staging: octeon: Do not use multiple blank lines. 2015-10-24 19:28:52 -07:00
octeon-usb staging: octeon-usb: Replace kmalloc with kmalloc_array 2015-10-24 19:28:52 -07:00
olpc_dcon Staging: olpc_dcon: Remove NULL comparison 2015-10-16 23:06:38 -07:00
panel Staging: panel: Logical continuations should be on the previous line 2015-10-29 07:55:17 +09:00
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 staging: rtl8192e: _rtl92e_fw_boot_cpu: Remove unneeded goto 2015-10-24 19:23:13 -07:00
rtl8192u Staging: rtl8192u: ieee80211: added missing blank lines 2015-10-29 09:10:55 +09:00
rtl8712 staging: rtl8712: rtl871x_io: Remove unused function 2015-10-29 07:55:17 +09:00
rtl8723au staging: rtl8723au: core: Remove unnecessary functions 2015-10-29 07:55:17 +09:00
rts5208 Staging: rts5208: use dmam_alloc_coherent 2015-10-16 23:17:26 -07:00
skein skein: fix coding style 2015-10-24 19:30:12 -07:00
slicoss staging: slicoss: Fixes block comment style 2015-10-27 14:43:31 +09:00
sm750fb staging: sm750fb: remove unused fields from struct sm750_dev 2015-10-27 17:04:57 +09:00
speakup Staging driver update for 4.4-rc1 2015-11-04 21:40:53 -08:00
ste_rmi4 Staging: ste_rmi4: Remove unnecessary MODULE_ALIAS() 2015-09-12 18:24:38 -07:00
unisys staging: unisys: Remove useless intialisation 2015-10-16 22:59:36 -07:00
vme staging: vme: devices: add spaces around '-' 2015-08-14 18:56:54 -07:00
vt6655 staging: vt6655: Add space around '*' 2015-10-24 19:38:48 -07:00
vt6656 staging: vt6656: Do not use multiple blank lines. 2015-10-27 16:53:12 +09:00
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 Staging: xgifb: Remove space after cast 2015-10-24 19:11:30 -07:00
Kconfig staging: ft1000: remove obsolete driver 2015-10-24 19:19:43 -07:00
Makefile staging: ft1000: remove obsolete driver 2015-10-24 19:19:43 -07:00
staging.c