linux/staging at bc2bebe8de8ed4ba6482c9cc370b0dd72ffe8cd2 - linux - Nytegear Gitea

mirrors/linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-06 05:17:28 -05:00

Files

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

..

staging: alarm-dev: information leak in alarm_compat_ioctl()

2013-06-04 10:26:14 -07:00

staging: Remove unnecessary OOM messages

2013-02-11 10:10:33 -08:00

Staging: bcm: Fix spelling error in PHSModule.c

2013-03-11 09:16:35 -07:00

staging: Remove unnecessary OOM messages

2013-02-11 10:10:33 -08:00

staging: comedi: complain if dma buffer allocation not supported

2013-05-13 17:38:48 -04:00

staging: cptm1217: Use dev_pm_ops

2013-04-08 10:20:16 -07:00

staging: crystalhd: remove use of __devexit

2012-11-21 15:05:12 -08:00

net: pass info struct via netdevice notifier

2013-05-28 13:11:01 -07:00

staging: single_open() leaks

2013-05-05 00:15:43 -04:00

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-05-01 17:51:54 -07:00

staging: dwc2: fix value of dma_mask

2013-05-30 21:14:30 +09:00

staging: echo.c: fix memory leakage

2013-01-07 14:03:32 -08:00

staging: et131x: cancel_work when module gets unloaded

2013-04-11 13:07:05 -07:00

staging: Remove unnecessary OOM messages

2013-02-11 10:10:33 -08:00

net: pass info struct via netdevice notifier

2013-05-28 13:11:01 -07:00

Merge tag 'tty-3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2013-04-29 12:16:17 -07:00

USB: remove remaining instances of USB_SUSPEND

2013-05-15 13:44:44 -04:00

staging/goldfish: Add MTD dependency to KCONFIG

2013-02-07 17:16:07 -08:00

staging:iio:light:tsl2x7x: fix the error handling in tsl2x7x_probe()

2013-05-22 22:14:57 +01:00

Merge remote-tracking branch 'pfdo/drm-fixes' into drm-next

2013-05-24 10:12:22 +10:00

keucr: switch to ->show_info()

2013-04-09 14:13:20 -04:00

staging: line6: pod.c: fix checkpatch warning

2013-03-11 09:47:13 -07:00

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

Staging: netlogic: remove unused variable in xlr_net_start_xmit()

2013-03-14 15:03:56 -07:00

Merge tag 'staging-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

2013-05-23 09:27:49 -07:00

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2013-02-21 17:40:58 -08:00

staging: olpc_dcon: return NOTIFY_DONE instead of the 0.

2013-03-25 11:02:55 -07:00

staging/ozwpan: info leak in oz_cdev_ioctl()

2013-04-22 10:25:46 -07:00

staging/panel: Mark local functions/structs static and add const if applicable (fix sparse warnings)

2013-02-15 10:20:14 -08:00

…

ACPI: Remove useless type argument of driver .remove() operation

2013-01-26 00:37:24 +01:00

staging: single_open() leaks

2013-05-05 00:15:43 -04:00

hostap: Don't use create_proc_read_entry()

2013-04-29 15:41:56 -04:00

staging/rtl8192u: convert skb->tail into skb_tail_pointer(skb)

2013-06-17 17:12:21 -07:00

rtl8712: remove redundant if statement

2013-03-11 09:49:55 -07:00

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-05-01 17:51:54 -07:00

staging: sb105x: Fix typo in comments and printk

2013-03-25 11:17:33 -07:00

staging: Remove unnecessary OOM messages

2013-02-11 10:10:33 -08:00

staging: sep: fix driver build and kconfig

2013-05-16 15:37:49 -07:00

TTY: add tty_port_tty_wakeup helper

2013-03-18 16:19:45 -07:00

net: Add missing dependencies on NETDEVICES

2013-06-19 22:22:56 -07:00

staging: slicoss: information leak in ETHTOOL_GSET

2013-04-05 14:17:00 -07:00

staging/sm7xxfb: Convert to SIMPLE_DEV_PM_OPS

2013-03-11 09:23:43 -07:00

staging: speakup: remove custom string_unescape_any_inplace

2013-04-30 17:04:03 -07:00

staging: ste_rmi4: Suppress 'ignoring return value of ‘regulator_enable()' warning

2013-05-16 15:37:49 -07:00

staging: ti-soc-thermal: fix device removal

2013-04-08 10:35:09 -07:00

staging: tidspbridge: rmgr: proc.c: fix checkpatch errors

2013-03-25 11:02:56 -07:00

staging: usbip: userspace: show product name in `list -l' command

2013-04-05 14:22:52 -07:00

staging: vme: fix for a potential NULL pointer dereference

2013-03-25 11:17:33 -07:00

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-05-01 17:51:54 -07:00

staging: vt6656: [bug] Fix missing spin lock in iwctl_siwpower.

2013-05-16 16:27:38 -07:00

staging: Add angle bracket before and after the URL

2013-01-07 14:56:04 -08:00

staging: single_open() leaks

2013-05-05 00:15:43 -04:00

…

staging: wlan-ng: prism2usb.c: fix printk(KERN_ERR... to dev_err(dev, ...

2013-03-26 16:13:20 -07:00

staging: xgifb: rename SR15/SR13 arrays to SR18

2013-03-28 16:10:16 -07:00

drivers: staging: zcache: fix compile error

2013-05-30 21:14:30 +09:00

zram: fix zram_bvec_read duplicate dump failure message and stat accumulation

2013-03-18 17:42:34 -07:00

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

…