Pablo Neira Ayuso 81bf1c64e7 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ...

Resolve conflicts with conntrack template fixes.

Conflicts:
	net/netfilter/nf_conntrack_core.c
	net/netfilter/nf_synproxy_core.c
	net/netfilter/xt_CT.c

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

2015-08-21 06:09:05 +02:00

..

acpi

Merge tag 'acpica-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2015-07-02 17:11:28 -07:00

asm-generic

mm: clean up per architecture MM hook header files

2015-07-17 16:39:53 -07:00

clocksource

…

crypto

…

drm

drm/radeon: add new OLAND pci id

2015-08-12 12:24:05 -04:00

dt-bindings

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

2015-07-01 19:22:00 -07:00

keys

…

kvm

…

linux

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2015-08-21 06:09:05 +02:00

math-emu

…

media

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

2015-07-01 19:09:11 -07:00

memory

…

misc

…

net

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2015-08-21 06:09:05 +02:00

pcmcia

…

ras

tracing: add trace event for memory-failure

2015-06-24 17:49:43 -07:00

rdma

IB: Add rdma_cap_ib_switch helper and use where appropriate

2015-07-14 13:20:08 -04:00

rxrpc

…

scsi

IB/srp: Avoid using uninitialized variable

2015-07-14 13:20:09 -04:00

soc

Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

2015-06-26 12:20:00 -07:00

sound

…

target

iscsi-target: Fix iscsit_start_kthreads failure OOPs

2015-07-24 14:19:43 -07:00

trace

Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs

2015-06-30 20:07:45 -07:00

uapi

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

2015-08-21 06:09:05 +02:00

video

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

2015-06-26 13:18:51 -07:00

xen

…

Kbuild

…