leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e5dfbf9a79
linux/drivers/staging
History
David S. Miller 36583eb54d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/cadence/macb.c
	drivers/net/phy/phy.c
	include/linux/skbuff.h
	net/ipv4/tcp.c
	net/switchdev/switchdev.c

Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD}
renaming overlapping with net-next changes of various
sorts.

phy.c was a case of two changes, one adding a local
variable to a function whilst the second was removing
one.

tcp.c overlapped a deadlock fix with the addition of new tcp_info
statistic values.

macb.c involved the addition of two zyncq device entries.

skbuff.h involved adding back ipv4_daddr to nf_bridge_info
whilst net-next changes put two other existing members of
that struct into a union.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-05-23 01:22:35 -04:00
..
android staging: android: ion: fix wrong init of dma_buf_export_info 2015-04-21 14:47:16 +05:30
board Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 2015-02-19 10:36:45 -08:00
clocking-wizard staging: clocking-wizard: Handle invalid clk in notifier 2015-01-17 16:06:20 -08:00
comedi Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2015-04-15 13:22:56 -07:00
dgap Staging: dgap: Use setup_timer to combine initialization 2015-03-16 16:17:31 +01:00
dgnc staging: dgnc_sysfs: Replace printk(KERN_ERR ) with pr_err() 2015-04-01 17:37:57 +02:00
emxx_udc Staging: emuxx_udc: replace pr_* with dev_* 2015-03-16 16:28:31 +01:00
fbtft staging: fbtft: Fix typo in fbtft 2015-03-26 13:07:29 +01:00
fsl-mc staging: fsl-mc: Changed version matching rules for MC object drivers 2015-04-03 13:55:03 +02:00
ft1000 staging: ft1000: Drop unneeded cast on netdev_priv 2015-04-03 14:00:14 +02:00
fwserial staging: fwserial: remove extra parentheses around function arguments 2015-03-15 18:41:11 +01:00
gdm72xx Staging: gdm72xx: use !x instead of x == NULL 2015-03-16 16:28:47 +01:00
gdm724x staging: gdm724x: Correction of variable usage after applying ALIGN() 2015-05-10 15:23:02 +02:00
goldfish staging/goldfish/goldfish_audio: Fix annotations 2015-03-20 14:13:17 +01:00
gs_fpgaboot staging: Remove <linux/moduleparam.h> header. 2015-03-01 17:09:52 -08:00
i2o Staging: i2o: Remove indentation of labels 2015-03-26 10:40:31 +01:00
iio Merge 4.0-rc7 into staging-next 2015-04-07 11:03:02 +02:00
lustre Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2015-04-26 17:22:07 -07:00
media [media] v4l: omap4iss: Replace outdated OMAP4 control pad API with syscon 2015-04-28 08:38:23 -03:00
mt29f_spinand staging: mt29f_spinand: remove pointer to pointer cast in function argument 2015-03-15 18:41:11 +01:00
netlogic staging: netlogic: allocate right size in devm_kzalloc 2015-03-20 14:13:17 +01:00
nvec Staging driver patches for 4.1-rc1 2015-04-13 17:37:33 -07:00
octeon Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2015-04-17 15:50:54 -04:00
octeon-usb staging: octeon-usb: make CVMX_WAIT_FOR_FIELD32 to take condition expression 2015-04-03 13:57:28 +02:00
olpc_dcon staging/olpc: drop pci dependencies 2015-04-03 13:56:03 +02:00
ozwpan staging: ozwpan: implement error handling in ozwpan_init() 2015-03-26 13:13:13 +01:00
panel staging: panel: fix lcd type 2015-03-26 11:00:22 +01:00
rtl8188eu Staging: rtl8188eu: replace kzalloc and memcpy by kmemdup 2015-03-26 13:16:19 +01:00
rtl8192e staging: rtl8192e: Remove dead code 2015-04-03 15:29:31 +02:00
rtl8192u Staging: rtl8192u: use correct array for debug output 2015-04-03 15:40:49 +02:00
rtl8712 staging: rtl8712: freeing an ERR_PTR 2015-05-08 01:58:04 +02:00
rtl8723au Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2015-04-15 09:00:47 -07:00
rts5208 staging: rts5208: Remove RTSX_READ_REG and RTSX_WRITE_REG macros 2015-03-26 13:17:05 +01:00
skein Staging: skein: Remove do-while(0) from single statement macros 2015-03-15 18:41:15 +01:00
slicoss Staging: slicoss: Remove redundant and disabled code block 2015-03-27 00:02:52 +01:00
sm7xxfb staging: sm7xxfb: disable pci device 2015-04-03 13:55:03 +02:00
sm750fb staging: sm750: remove incorrect __exit annotation 2015-05-08 01:58:04 +02:00
speakup staging: speakup: Fix warning of line over 80 characters. 2015-04-03 13:43:45 +02:00
ste_rmi4 Staging: ste_rmi4: Use SIMPLE_DEV_PM_OPS() macro 2015-03-20 13:37:31 +01:00
unisys Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2015-04-14 15:31:03 -07:00
vme staging: vme: mmap() support for vme_user 2015-03-06 17:03:22 -08:00
vt6655 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-05-23 01:22:35 -04:00
vt6656 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-05-23 01:22:35 -04:00
wlan-ng Staging: wlan-ng: Remove typedef prism2sta_accesslist_t 2015-03-23 22:41:16 +01:00
xgifb staging: xgifb: remove extra parentheses around right bit shift operations 2015-03-06 15:22:43 -08:00
Kconfig staging: fsl-mc: Freescale Management Complex (fsl-mc) bus driver 2015-03-06 17:28:09 -08:00
Makefile staging: fsl-mc: Freescale Management Complex (fsl-mc) bus driver 2015-03-06 17:28:09 -08:00
staging.c