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

..

asm-generic

…

drm

Merge tag 'topic/drm-misc-2015-02-06' of git://anongit.freedesktop.org/drm-intel into drm-next

2015-02-11 15:33:02 +10:00

linux

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

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

misc

…

mtd

…

rdma

IB/core: Add on demand paging caps to ib_uverbs_ex_query_device

2015-02-18 08:36:26 -08:00

scsi

…

sound

…

video

…

xen

…

Kbuild

…