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

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	include/linux/inetdevice.h

The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.

The iwlwifi conflict is a context overlap.

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

2013-08-26 16:37:08 -04:00

..

acpi

ACPI: Try harder to resolve _ADR collisions for bridges

2013-08-07 22:55:00 +02:00

asm-generic

Fix TLB gather virtual address range invalidation corner cases

2013-08-16 08:52:46 -07:00

clocksource

…

crypto

…

drm

drm: fix 64 bit drm fixed point helpers

2013-07-30 17:24:13 -04:00

dt-bindings

Merge tag 'pinctrl-for-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl

2013-07-28 18:19:27 -07:00

keys

…

kvm

…

linux

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

2013-08-26 16:37:08 -04:00

math-emu

…

media

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

2013-08-16 15:37:26 -07:00

memory

…

misc

…

net

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

2013-08-26 16:37:08 -04:00

pcmcia

…

ras

…

rdma

…

rxrpc

…

scsi

…

sound

…

target

…

trace

Merge tag 'trace-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

2013-07-22 19:07:24 -07:00

uapi

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

2013-08-26 16:37:08 -04:00

video

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2013-07-09 16:04:31 -07:00

xen

Merge branch 'for-3.11/drivers' of git://git.kernel.dk/linux-block

2013-07-22 19:02:52 -07:00

Kbuild

…