David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

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

2016-07-06 10:35:22 -07:00

..

acpi

Merge branches 'acpica-fixes', 'acpi-video' and 'acpi-processor'

2016-06-03 22:35:05 +02:00

asm-generic

locking/qspinlock: Fix spin_unlock_wait() some more

2016-06-08 14:29:08 +02:00

clocksource

…

crypto

…

drm

drm/i915: Removing PCI IDs that are no longer listed as Kabylake.

2016-06-29 12:19:13 +03:00

dt-bindings

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

2016-05-26 09:23:43 -07:00

keys

…

kvm

arm64: KVM: fix build with CONFIG_ARM_PMU disabled

2016-06-27 12:55:51 +02:00

linux

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

2016-07-06 10:35:22 -07:00

math-emu

…

media

Update my main e-mails at the Kernel tree

2016-06-15 15:35:37 -10:00

memory

…

misc

…

net

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

2016-07-06 10:35:22 -07:00

pcmcia

…

ras

…

rdma

IB/rdmavt: Correct qp_priv_alloc() return value test

2016-06-23 10:16:15 -04:00

rxrpc

…

scsi

…

soc

fsl/qe: Do not prefix header guard with CONFIG_

2016-06-08 11:08:01 -07:00

sound

…

target

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

2016-05-28 12:04:17 -07:00

trace

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2016-05-27 13:41:54 -07:00

uapi

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

2016-07-06 10:35:22 -07:00

video

Merge tag 'imx-drm-fixes-2016-05-24' of git://git.pengutronix.de/git/pza/linux into drm-next

2016-05-25 12:36:20 +10:00

xen

…

Kbuild

…