Johannes Berg 944b9e375d Merge remote-tracking branch 'mac80211/master' into mac80211-next ... Pull in mac80211.git to let the next patch apply without conflicts, also resolving a hwsim conflict. Conflicts: drivers/net/wireless/mac80211_hwsim.c Signed-off-by: Johannes Berg <johannes.berg@intel.com>		2012-09-06 15:56:02 +02:00
..
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2012-07-26 14:28:55 -07:00
asm-generic	Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm	2012-07-27 15:14:26 -07:00
crypto
drm	Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next	2012-07-26 10:35:44 +10:00
keys
linux	Revert "rfkill: remove dead code"	2012-08-21 20:50:25 +02:00
math-emu
media
memory
misc
mtd
net	Merge remote-tracking branch 'mac80211/master' into mac80211-next	2012-09-06 15:56:02 +02:00
pcmcia
rdma	Merge branches 'cma', 'cxgb4', 'misc', 'mlx4-sriov', 'mlx-cleanups', 'ocrdma' and 'qib' into for-linus	2012-07-22 23:26:17 -07:00
rxrpc
scsi	Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream	2012-07-25 15:58:48 -04:00
sound	Merge branch 'topic/pm-convert' into for-next	2012-07-19 08:21:57 +02:00
target	target: Allow for target_submit_cmd() returning errors	2012-07-17 17:05:05 -07:00
trace	Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-07-26 13:17:17 -07:00
video
xen	xen PVonHVM: move shared_info to MMIO before kexec	2012-07-19 15:52:05 -04:00
Kbuild