Nicolas Dichtel 870a2df4ca xfrm: rename struct xfrm_filter ...

iproute2 already defines a structure with that name, let's use another one to
avoid any conflict.

CC: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

2014-03-07 08:12:37 +01:00

..

asm-generic

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-01-29 18:22:16 -08:00

drm

Merge tag 'vmwgfx-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux into drm-fixes

2014-02-19 08:21:02 +10:00

linux

xfrm: rename struct xfrm_filter

2014-03-07 08:12:37 +01:00

mtd

mtd: mtd-abi: add a helper to detect the nand type

2013-10-27 16:27:06 -07:00

rdma

IB/core: Re-enable create_flow/destroy_flow uverbs

2013-11-17 08:22:09 -08:00

scsi

[SCSI] Merge tag 'fcoe-02-19-13' into for-linus

2013-03-01 09:10:08 +00:00

sound

ALSA: compress: add num_sample_rates in snd_codec_desc

2014-01-07 18:33:40 +01:00

video

UAPI: (Scripted) Disintegrate include/video

2012-12-20 17:14:26 +00:00

xen

xen: install xen/gntdev.h and xen/gntalloc.h

2014-02-11 10:12:36 -05:00

Kbuild

…