David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-06-15 11:59:32 -04:00

..

android

staging/android/ion: remove useless document file

2017-05-15 11:17:31 +02:00

board

…

ccree

staging: ccree: fix buffer copy

2017-06-06 16:23:27 +02:00

clocking-wizard

…

comedi

staging: comedi: addi_apci_3xxx: check return value

2017-04-25 20:43:42 +02:00

dgnc

…

emxx_udc

…

fbtft

staging: fbtft: fix open parentheses alignment

2017-04-28 12:07:25 +02:00

fsl-dpaa2

staging: fsl-dpaa2/eth: add ETHERNET dependency

2017-05-16 14:23:31 +02:00

fsl-mc

staging: fsl-mc/dpio: add cpu <--> LE conversion for dpaa2_fd

2017-04-28 17:51:54 +02:00

fwserial

…

gdm724x

staging: gdm724x: gdm_mux: fix use-after-free on module unload

2017-04-28 12:32:49 +02:00

goldfish

…

greybus

staging: greybus: uart.c: Remove include linux/serial.h

2017-04-18 13:27:16 +02:00

gs_fpgaboot

…

iio

Staging: iio: accel: adis16203: fixed a brace coding style issue

2017-04-14 16:13:34 +01:00

ks7010

staging: ks7010: remove line continuations in quoted strings

2017-04-28 17:51:39 +02:00

lustre

staging/lustre/lov: remove set_fs() call from lov_getstripe()

2017-06-03 17:17:19 +09:00

media

[media] atomisp: don't treat warnings as errors

2017-06-04 15:23:32 -03:00

most

format-security: move static strings to const

2017-05-08 17:15:14 -07:00

mt29f_spinand

…

netlogic

net: phy: Make phy_ethtool_ksettings_get return void

2017-06-13 12:59:06 -04:00

nvec

…

octeon

…

octeon-usb

…

olpc_dcon

staging: olpc_dcon: style fixes

2017-04-28 12:07:24 +02:00

rtl8188eu

net: Fix inconsistent teardown and release of private netdev state.

2017-06-07 15:53:24 -04:00

rtl8192e

staging: rtl8192e: GetTs Fix invalid TID 7 warning.

2017-05-15 11:48:45 +02:00

rtl8192u

staging: rtl8192u: fix spelling mistake in variable name *attentuation

2017-04-28 12:27:50 +02:00

rtl8712

…

rtl8723bs

net: Fix build regression in rtl8723bs staging driver.

2017-06-08 11:51:59 -04:00

rts5208

…

skein

…

sm750fb

…

speakup

Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

2017-05-10 19:13:03 -07:00

typec

staging: typec: fusb302: refactor resume retry mechanism

2017-05-16 14:23:31 +02:00

unisys

staging: unisys: visorhba: fix s-Par to boot with option CONFIG_VMAP_STACK set to y

2017-04-28 11:55:53 +02:00

vc04_services

staging: vc04_services: Fix bulk cache maintenance

2017-05-15 11:48:44 +02:00

vme

Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

2017-05-10 19:13:03 -07:00

vt6655

…

vt6656

staging: vt6656: use tabs instead of spaces

2017-04-28 14:30:43 +02:00

wilc1000

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

2017-05-05 18:16:23 -07:00

wlan-ng

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

2017-05-05 18:16:23 -07:00

xgifb

…

Kconfig

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

2017-05-05 18:16:23 -07:00

Makefile

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

2017-05-05 18:16:23 -07:00