John W. Linville 9b34f40c20 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless ... Conflicts: drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c net/mac80211/mlme.c		2012-10-23 11:41:46 -04:00
..
acpi	…
asm-generic	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2012-10-14 14:39:05 -07:00
clocksource	…
crypto	Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux	2012-10-14 13:39:34 -07:00
drm	…
keys	…
linux	bcma: add an extra pcie core struct	2012-10-19 15:52:59 -04:00
math-emu	…
media	…
memory	…
misc	…
mtd	…
net	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2012-10-23 11:41:46 -04:00
pcmcia	…
ras	…
rdma	…
rxrpc	…
scsi	SCSI misc on 20121012	2012-10-13 10:57:01 +09:00
sound	…
target	…
trace	…
uapi	nl/cfg80211: force scan using an AP vif if requested	2012-10-18 17:21:22 +02:00
video	fbdev updates for 3.7	2012-10-12 10:21:02 +09:00
xen	UAPI Disintegration 2012-10-09	2012-10-13 11:14:29 +09:00
Kbuild	…