Jiri Benc 427bc465bf vxlan: remove duplicated macros ... VNI_HASH_BITS and VNI_HASH_SIZE are defined twice. Remove the extra definitions. Signed-off-by: Jiri Benc <jbenc@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-07 13:51:00 -05:00
..
acpi	Merge branches 'acpica', 'acpi-video' and 'acpi-fan'	2016-01-21 00:41:59 +01:00
asm-generic	Merge branch 'akpm' (patches from Andrew)	2016-01-21 12:32:08 -08:00
clocksource
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2016-01-22 11:58:43 -08:00
drm	drm/atomic-helper: Export framebuffer_changed()	2016-01-20 08:55:43 +08:00
dt-bindings	ARM: SoC driver updates for v4.5	2016-01-20 18:42:30 -08:00
keys
kvm
linux	bpf: add lookup/update support for per-cpu hash and array maps	2016-02-06 03:34:36 -05:00
math-emu
media
memory
misc
net	vxlan: remove duplicated macros	2016-02-07 13:51:00 -05:00
pcmcia
ras
rdma	IB/mlx4: Enable send of RoCE QP1 packets with IP/UDP headers	2016-01-19 15:35:01 -05:00
rxrpc
scsi	Initial roundup of 4.5 merge window patches	2016-01-23 18:45:06 -08:00
soc	ARM: SoC driver updates for v4.5	2016-01-20 18:42:30 -08:00
sound	ALSA: timer: Introduce disconnect op to snd_timer_instance	2016-01-21 17:51:42 +01:00
target	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2016-01-20 17:20:53 -08:00
trace	This includes three minor fixes, mostly due to cut-and-paste issues.	2016-01-28 17:00:50 -08:00
uapi	bpf: introduce BPF_MAP_TYPE_PERCPU_ARRAY map	2016-02-06 03:34:36 -05:00
video
xen	Merge branch 'for-4.5/drivers' of git://git.kernel.dk/linux-block	2016-01-21 18:19:38 -08:00
Kbuild