David S. Miller 6abdd5f593 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

All three conflicts were cases of simple overlapping
changes.

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

2016-08-30 00:54:02 -04:00

..

acpi

…

asm-generic

locking/qrwlock: Fix write unlock bug on big endian systems

2016-08-10 14:13:27 +02:00

clocksource

…

crypto

…

drm

…

dt-bindings

…

keys

…

kvm

…

linux

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

2016-08-30 00:54:02 -04:00

math-emu

…

media

…

memory

…

misc

…

net

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

2016-08-30 00:54:02 -04:00

pcmcia

…

ras

…

rdma

IB/core: Use memdup_user() rather than duplicating its implementation

2016-08-23 12:40:13 -04:00

rxrpc

…

scsi

…

soc

…

sound

…

target

…

trace

rxrpc: Use a tracepoint for skb accounting debugging

2016-08-23 15:27:24 +01:00

uapi

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

2016-08-30 00:54:02 -04:00

video

…

xen

xen: change the type of xen_vcpu_id to uint32_t

2016-08-24 18:17:27 +01:00

Kbuild

…