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

Conflicts:
	include/net/inetpeer.h
	net/ipv6/output_core.c

Changes in net were fixing bugs in code removed in net-next.

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

2014-06-03 23:32:12 -07:00

..

acpi

…

asm-generic

asm-generic: remove _STK_LIM_MAX

2014-05-15 00:32:09 +01:00

clocksource

…

crypto

…

drm

Merge branch 'mullins' of git://people.freedesktop.org/~deathsimple/linux into drm-fixes

2014-05-07 09:10:28 +10:00

dt-bindings

Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes

2014-04-26 11:29:30 +02:00

keys

…

kvm

…

linux

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

2014-06-03 23:32:12 -07:00

math-emu

…

media

…

memory

…

misc

…

net

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

2014-06-03 23:32:12 -07:00

pcmcia

…

ras

…

rdma

…

rxrpc

…

scsi

…

sound

…

target

…

trace

Merge tag 'trace-fixes-v3.15-rc4-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

2014-05-08 14:17:13 -07:00

uapi

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

2014-06-03 23:32:12 -07:00

video

…

xen

…

Kbuild

…