Vlad Yasevich e1618d461c vlan: Fix build error wth vlan_get_encap_level() ... The new function vlan_get_encap_level() uses vlan_dev_priv() which is only conditionally avaialble when VLAN support is enabled. Make vlan_get_encap_level() conditionally available as well. Fixes: 44a4085538 ("bonding: Fix stacked device detection in arp monitoring") Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> CC: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Vlad Yasevich <vyasevic@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2014-05-20 11:24:26 -04:00
..
acpi	IOMMU Upates for Linux v3.15	2014-04-05 18:46:26 -07:00
asm-generic	- vexpress platform clocks initialisation moved earlier following the	2014-05-04 14:34:50 -07:00
clocksource
crypto	crypto: export NULL algorithms defines	2014-03-21 21:54:26 +08:00
drm	Merge branch 'drm-next-3.15-wip' of git://people.freedesktop.org/~deathsimple/linux into drm-next	2014-04-19 11:16:02 +10:00
dt-bindings	dt: tegra: remove non-existent clock IDs	2014-04-24 15:37:08 +02:00
keys
kvm
linux	vlan: Fix build error wth vlan_get_encap_level()	2014-05-20 11:24:26 -04:00
math-emu
media	[media] rc-core: remove generic scancode filter	2014-04-06 11:30:29 -03:00
memory
misc
net	ipv6: update Destination Cache entries when gateway turn into host	2014-05-15 23:26:27 -04:00
pcmcia
ras
rdma	Merge branches 'core', 'cxgb4', 'ip-roce', 'iser', 'misc', 'mlx4', 'nes', 'ocrdma', 'qib', 'sgwrapper', 'srp' and 'usnic' into for-next	2014-04-03 08:30:17 -07:00
rxrpc
scsi	scsi: Make sure cmd_flags are 64-bit	2014-04-09 20:26:20 -06:00
sound	ALSA: cs8427: separate HW initialization	2014-04-03 14:59:48 +02:00
target	target/sbc: Add sbc_dif_read_strip software emulation	2014-04-07 01:48:57 -07:00
trace	Fix: tracing: use 'E' instead of 'X' for unsigned module tain flag	2014-04-23 13:56:51 +09:30
uapi	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem	2014-05-15 10:24:28 -04:00
video	fbdev changes for 3.15 (OMAP)	2014-04-07 10:47:51 -07:00
xen
Kbuild