John W. Linville bf515fb11a This relatively large batch of changes is comprised of the ... following: * large mac80211-hwsim changes from Ben, Jukka and a bit myself * OCB/WAVE/11p support from Rostislav on behalf of the Czech Technical University in Prague and Volkswagen Group Research * minstrel VHT work from Karl * more CSA work from Luca * WMM admission control support in mac80211 (myself) * various smaller fixes, spelling corrections, and minor API additions -----BEGIN PGP SIGNATURE----- iQIcBAABCAAGBQJUWMs/AAoJEDBSmw7B7bqrmBQQAIbfAe7wH1WifRtOnhw3zWQQ K36+Edf3HlQ+EIkSs63QousRj2e7pGDOyhzMWLaqsmeTLteUtlGbr7qwiJO1QZdf Ml2V5O2s+b8hUIClDBVQF2L6+GGUmRUdQqvDDhkN1guoxD/Nk8cNtsRkSdiXWJWy R48NzvYDflBhc8uqPtR8jDb10eM3c00YP9HB+w9hYAfizD+FRue7UNp4MQIqwp9V HdKRT6L2n/6QA+Mzse0rMDes5qI7nIUNgj+hjqgJSnhITPMgGR5j/pitnVHrr81M ngOipBFG3svsQrwZh8nM4Llp0cM4Gs+GlgCieu9+TJpr2sY00Z3kYcp0pxtDoSxz Wblqz9n/bnW9mrkEfl12XqwwT5vguchwHoZ9cXhejDxSawWXoTRx20uW4ahO8ArA kWwwjTBVsQ5WMCtOBiqggzNKghwCc2ILmcZnjGdg9aNXcWsmQ4vyeCfG2QxBz/UB Grv/f9NSy6mzKQ34yv+lyR7rFZ8XcT03EVAnZSYz8X0ZZGxwtFupRp1RrBh1KPtD TJoe6Q71FfHKYRJ2xgygYkQFo+r9d0BKBeerq+Vu2hBeaqyi4aUwSj7d1sUaaq6N tL8fmAUqFjVOOUFeH1g07Xke5QD+yrEC7sJKkeRMfcRGB+dEa+2m3I5p4WDz9bWM AEvFSsYr/I9KI4d1huXD =6GIj -----END PGP SIGNATURE----- Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next Johannes Berg <johannes@sipsolutions.net> says: "This relatively large batch of changes is comprised of the following: * large mac80211-hwsim changes from Ben, Jukka and a bit myself * OCB/WAVE/11p support from Rostislav on behalf of the Czech Technical University in Prague and Volkswagen Group Research * minstrel VHT work from Karl * more CSA work from Luca * WMM admission control support in mac80211 (myself) * various smaller fixes, spelling corrections, and minor API additions" Conflicts: drivers/net/wireless/ath/wil6210/cfg80211.c Signed-off-by: John W. Linville <linville@tuxdriver.com>		2014-11-04 16:18:12 -05:00
..
acpi	ACPICA: Introduce acpi_enable_all_wakeup_gpes()	2014-09-30 21:04:47 +02:00
asm-generic	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2014-10-18 14:24:36 -07:00
clocksource
crypto	crypto: LLVMLinux: Add macro to remove use of VLAIS in crypto code	2014-10-14 10:51:22 +02:00
drm	drm/mst: rework payload table allocation to conform better.	2014-10-13 14:40:53 +10:00
dt-bindings	The clk tree changes for 3.18 are dominated by clock drivers. Mostly	2014-10-15 07:05:03 +02:00
keys	KEYS: Restore partial ID matching functionality for asymmetric keys	2014-10-06 15:21:05 +01:00
kvm	arm/arm64: KVM: Fix BE accesses to GICv2 EISR and ELRSR regs	2014-10-16 10:57:41 +02:00
linux	This relatively large batch of changes is comprised of the	2014-11-04 16:18:12 -05:00
math-emu
media	Merge branch 'patchwork' into v4l_for_linus	2014-10-09 14:00:54 -03:00
memory
misc	cxl: Add new header for call backs and structs	2014-10-08 20:15:43 +11:00
net	This relatively large batch of changes is comprised of the	2014-11-04 16:18:12 -05:00
pcmcia
ras
rdma	IB/mlx5, iser, isert: Add Signature API additions	2014-10-09 00:10:53 -07:00
rxrpc
scsi	Merge branch 'for-3.18/core' of git://git.kernel.dk/linux-block	2014-10-18 11:53:51 -07:00
soc/tegra
sound	Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma	2014-10-18 18:11:04 -07:00
target
trace	Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-10-13 15:44:12 +02:00
uapi	This relatively large batch of changes is comprised of the	2014-11-04 16:18:12 -05:00
video	fbdev changes for 3.18	2014-10-18 18:03:02 -07:00
xen	xen: remove DEFINE_XENBUS_DRIVER() macro	2014-10-06 10:27:57 +01:00
Kbuild