leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
01276ed242
linux/drivers/staging
History
David S. Miller 0c1072ae02 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/freescale/fec_main.c
	drivers/net/ethernet/renesas/sh_eth.c
	net/ipv4/gre.c

The GRE conflict is between a bug fix (kfree_skb --> kfree_skb_list)
and the splitting of the gre.c code into seperate files.

The FEC conflict was two sets of changes adding ethtool support code
in an "!CONFIG_M5272" CPP protected block.

Finally the sh_eth.c conflict was between one commit add bits set
in the .eesr_err_check mask whilst another commit removed the
.tx_error_check member and assignments.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-07-03 14:55:13 -07:00
..
android staging: alarm-dev: information leak in alarm_compat_ioctl() 2013-06-04 10:26:14 -07:00
asus_oled
bcm
ced1401
comedi staging: comedi: complain if dma buffer allocation not supported 2013-05-13 17:38:48 -04:00
cptm1217 staging: cptm1217: Use dev_pm_ops 2013-04-08 10:20:16 -07:00
crystalhd
csr net: pass info struct via netdevice notifier 2013-05-28 13:11:01 -07:00
cxt1e1 staging: single_open() leaks 2013-05-05 00:15:43 -04:00
dgrp Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2013-05-01 17:51:54 -07:00
dwc2 staging: dwc2: fix value of dma_mask 2013-05-30 21:14:30 +09:00
echo
et131x staging: et131x: cancel_work when module gets unloaded 2013-04-11 13:07:05 -07:00
frontier
ft1000 net: pass info struct via netdevice notifier 2013-05-28 13:11:01 -07:00
fwserial TTY/Serial driver update for 3.10-rc1 2013-04-29 12:16:17 -07:00
gdm72xx USB: remove remaining instances of USB_SUSPEND 2013-05-15 13:44:44 -04:00
goldfish
iio staging:iio:light:tsl2x7x: fix the error handling in tsl2x7x_probe() 2013-05-22 22:14:57 +01:00
imx-drm Merge remote-tracking branch 'pfdo/drm-fixes' into drm-next 2013-05-24 10:12:22 +10:00
keucr keucr: switch to ->show_info() 2013-04-09 14:13:20 -04:00
line6
media Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2013-06-18 06:25:08 -10:00
netlogic
nvec Staging driver fixes for 3.10-rc2 2013-05-23 09:27:49 -07:00
octeon
olpc_dcon staging: olpc_dcon: return NOTIFY_DONE instead of the 0. 2013-03-25 11:02:55 -07:00
ozwpan staging/ozwpan: info leak in oz_cdev_ioctl() 2013-04-22 10:25:46 -07:00
panel
phison
quickstart
rtl8187se staging: single_open() leaks 2013-05-05 00:15:43 -04:00
rtl8192e hostap: Don't use create_proc_read_entry() 2013-04-29 15:41:56 -04:00
rtl8192u staging/rtl8192u: convert skb->tail into skb_tail_pointer(skb) 2013-06-17 17:12:21 -07:00
rtl8712
rts5139 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2013-05-01 17:51:54 -07:00
sb105x staging: sb105x: Fix typo in comments and printk 2013-03-25 11:17:33 -07:00
sbe-2t3e3
sep staging: sep: fix driver build and kconfig 2013-05-16 15:37:49 -07:00
serqt_usb2
silicom net: Add missing dependencies on NETDEVICES 2013-06-19 22:22:56 -07:00
slicoss staging: slicoss: information leak in ETHTOOL_GSET 2013-04-05 14:17:00 -07:00
sm7xxfb
speakup staging: speakup: remove custom string_unescape_any_inplace 2013-04-30 17:04:03 -07:00
ste_rmi4 staging: ste_rmi4: Suppress 'ignoring return value of ‘regulator_enable()' warning 2013-05-16 15:37:49 -07:00
ti-soc-thermal staging: ti-soc-thermal: fix device removal 2013-04-08 10:35:09 -07:00
tidspbridge staging: tidspbridge: rmgr: proc.c: fix checkpatch errors 2013-03-25 11:02:56 -07:00
usbip staging: usbip: userspace: show product name in `list -l' command 2013-04-05 14:22:52 -07:00
vme staging: vme: fix for a potential NULL pointer dereference 2013-03-25 11:17:33 -07:00
vt6655 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2013-05-01 17:51:54 -07:00
vt6656 staging: vt6656: [bug] Fix missing spin lock in iwctl_siwpower. 2013-05-16 16:27:38 -07:00
winbond
wlags49_h2 staging: single_open() leaks 2013-05-05 00:15:43 -04:00
wlags49_h25
wlan-ng staging: wlan-ng: prism2usb.c: fix printk(KERN_ERR... to dev_err(dev, ... 2013-03-26 16:13:20 -07:00
xgifb staging: xgifb: rename SR15/SR13 arrays to SR18 2013-03-28 16:10:16 -07:00
zcache drivers: staging: zcache: fix compile error 2013-05-30 21:14:30 +09:00
zram zram: fix zram_bvec_read duplicate dump failure message and stat accumulation 2013-03-18 17:42:34 -07:00
zsmalloc staging/zsmalloc: don't use pgtable-mapping from modules 2013-04-23 10:34:20 -07:00
Kconfig staging: Swap zram and zsmalloc in Kconfig 2013-05-16 15:38:58 -07:00
Makefile staging: net: remove pc300 driver 2013-04-19 11:15:20 -07:00
staging.c