Pablo Neira Ayuso aadd51aa71 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ...

Resolve conflicts between 5888b93 ("Merge branch 'nf-hook-compress'") and
Florian Westphal br_netfilter works.

Conflicts:
        net/bridge/br_netfilter.c

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

2015-04-08 18:30:21 +02:00

..

acpi

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

2015-02-19 11:28:36 -08:00

asm-generic

Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-02-18 09:24:01 -08:00

clocksource

…

crypto

crypto: af_alg - Allow to link sgl

2015-03-23 16:41:37 -04:00

drm

drm/ttm: device address space != CPU address space

2015-03-05 09:04:39 +10:00

dt-bindings

ARM: dts: am43xx: fix SLEWCTRL_FAST pinctrl binding

2015-03-06 09:21:03 -08:00

keys

…

kvm

arm/arm64: KVM: Keep elrsr/aisr in sync with software model

2015-03-14 13:42:07 +01:00

linux

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

2015-04-08 18:30:21 +02:00

math-emu

…

media

…

memory

…

misc

…

net

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

2015-04-08 18:30:21 +02:00

pcmcia

…

ras

…

rdma

Revert "IB/core: Add support for extended query device caps"

2015-02-06 00:54:33 -08:00

rxrpc

…

scsi

Merge branch 'for-3.20/core' of git://git.kernel.dk/linux-block

2015-02-12 14:13:23 -08:00

soc

pm: at91: Workaround DDRSDRC self-refresh bug with LPDDR1 memories.

2015-03-03 19:43:59 +01:00

sound

ALSA: pcm: allow for trigger_tstamp snapshot in .trigger

2015-02-09 16:01:53 +01:00

target

target: do not reject FUA CDBs when write cache is enabled but emulate_write_cache is 0

2015-03-19 23:26:46 -07:00

trace

regmap: introduce regmap_name to fix syscon regmap trace events

2015-03-19 20:04:55 +00:00

uapi

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

2015-04-08 18:30:21 +02:00

video

OMAPDSS: fix regression with display sysfs files

2015-02-26 10:23:15 +02:00

xen

xen: Remove trailing semicolon from xenbus_register_frontend() definition

2015-03-02 10:38:59 +00:00

Kbuild

…