2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 15:13:55 +08:00
linux-next/drivers/staging
David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	arch/mips/net/bpf_jit.c
	drivers/net/can/flexcan.c

Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-09-23 12:09:27 -04:00
..
android android: fix reference leak in sync_fence_create 2014-09-08 13:42:00 -07:00
bcm Staging: bcm: Qos.c: checkpatch.pl fix: Indentation of case-statements fixed 2014-07-30 17:14:24 -07:00
board
comedi staging: comedi: addi_apci_1564: remove diagnostic interrupt support code 2014-08-01 15:37:22 -07:00
cptm1217
dgap staging: dgap: remove dgap_newnode() 2014-07-15 08:26:29 -07:00
dgnc staging: dgnc: Remove unneeded dgnc_trace.c and dgnc_trace.h 2014-08-01 14:50:04 -07:00
emxx_udc staging: emxx_udc: Fix coding style errors 2014-07-15 21:55:29 -07:00
et131x staging: et131x: Fix errors caused by phydev->addr accesses before initialisation 2014-08-17 07:07:55 -07:00
ft1000 staging: ft1000: remove procfs entries 2014-07-27 11:45:46 -07:00
fwserial
gdm72xx Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2014-08-06 09:38:14 -07:00
gdm724x Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2014-08-06 09:38:14 -07:00
goldfish staging/goldfish/goldfish_audio: fix a sparse warning 2014-07-23 18:12:23 -07:00
gs_fpgaboot
iio iio: meter: ade7758: Fix indio_dev->trig assignment 2014-08-25 21:49:21 +01:00
imx-drm imx-drm: imx-ldb: fix NULL pointer in imx_ldb_unbind() 2014-09-08 12:10:28 -07:00
line6
lustre [fix] lustre: d_make_root() does iput() on dentry allocation failure 2014-09-13 22:13:39 -04:00
media Staging driver patches for 3.17-rc1 2014-08-04 18:36:12 -07:00
mt29f_spinand
netlogic staging: netlogic: coding style fixup 2014-07-27 08:57:38 -07:00
nokia_h4p
nvec staging/nvec: Use platform_get_irq() 2014-07-30 17:18:47 -07:00
octeon staging: octeon: fix coding style 2014-07-15 08:32:55 -07:00
octeon-usb
olpc_dcon
ozwpan
panel
rtl8188eu staging: r8188eu: Add new USB ID 2014-08-25 15:00:56 -07:00
rtl8192e staging: use pci_zalloc_consistent 2014-08-08 15:57:30 -07:00
rtl8192ee staging: use pci_zalloc_consistent 2014-08-08 15:57:30 -07:00
rtl8192u staging:r8190: coding style: Fixed checkpatch reported Error 2014-08-01 14:42:52 -07:00
rtl8712 staging:rtl8712:mlme_linux.c: Adds blank lines to pass checkpatch.pl 2014-07-30 17:05:56 -07:00
rtl8723au cfg80211: allow passing frame type to cfg80211_inform_bss() 2014-08-26 11:16:02 +02:00
rtl8821ae staging: use pci_zalloc_consistent 2014-08-08 15:57:30 -07:00
rts5208 SCSI misc on 20140806 2014-08-06 20:10:32 -07:00
skein
slicoss staging: use pci_zalloc_consistent 2014-08-08 15:57:30 -07:00
speakup Update speakup mailing list address 2014-07-18 16:36:29 -07:00
ste_rmi4
unisys staging: visorchipset: fix sparse warnings about static declaration 2014-08-01 14:39:26 -07:00
vme staging: vme: removed useless breaks in vme_user.c 2014-07-23 18:21:59 -07:00
vt6655 staging: vt6655: buffer overflow in ioctl 2014-09-19 15:32:20 -07:00
vt6656 staging: vt6656: wcmd.h remove dead macros 2014-07-27 11:19:57 -07:00
wlan-ng cfg80211: allow passing frame type to cfg80211_inform_bss() 2014-08-26 11:16:02 +02:00
xgifb
xillybus staging: xillybus: Removed outdated part in README 2014-07-17 17:18:44 -07:00
Kconfig usbip: move usbip kernel code out of staging 2014-08-25 10:40:06 -07:00
Makefile usbip: move usbip kernel code out of staging 2014-08-25 10:40:06 -07:00
staging.c