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

..

acpi

Merge branch 'acpica-fixes'

2017-06-15 01:52:32 +02:00

asm-generic

Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2017-05-10 20:45:36 -07:00

clocksource

clocksource: arm_arch_timer: add structs to describe MMIO timer

2017-04-19 16:11:48 +01:00

crypto

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2017-05-03 08:50:52 -07:00

drm

drm/dp: start a DPCD based DP sink/branch device quirk database

2017-05-29 13:43:26 +03:00

dt-bindings

Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

2017-05-10 13:38:18 -07:00

keys

…

kvm

KVM: arm/arm64: Fix bug when registering redist iodevs

2017-05-18 11:18:12 +02:00

linux

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

math-emu

…

media

[media] media/cec.h: use IS_REACHABLE instead of IS_ENABLED

2017-06-08 16:52:28 -03:00

memory

…

misc

…

net

net: dsa: Associate slave network device with CPU port

2017-06-13 16:35:03 -04:00

pcmcia

…

ras

…

rdma

RDMA/SA: Fix kernel panic in CMA request handler flow

2017-06-01 17:20:14 -04:00

rxrpc

rxrpc: Implement service upgrade

2017-06-05 14:30:49 +01:00

scsi

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2017-05-12 11:44:13 -07:00

soc

net/wan/fsl_ucc_hdlc: add hdlc-bus support

2017-05-18 10:28:39 -04:00

sound

Merge tag 'asoc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

2017-05-02 08:25:25 +02:00

target

iscsi-target: Fix initial login PDU asynchronous socket close OOPs

2017-05-31 15:12:31 -07:00

trace

rxrpc: Add service upgrade support for client connections

2017-06-05 14:30:49 +01:00

uapi

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

video

uapi: export all headers under uapi directories

2017-05-11 00:21:54 +09:00

xen

xen: Implement EFI reset_system callback

2017-05-02 12:06:50 +02:00