John W. Linville 812fd64596 Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next ... Conflicts: drivers/net/wireless/iwlwifi/mvm/mac80211.c		2013-06-12 15:39:05 -04:00
..
acpi	Merge branch 'acpi-assorted'	2013-04-28 01:54:08 +02:00
asm-generic	Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-05-05 13:23:27 -07:00
clocksource	ARM: late Exynos multiplatform changes	2013-05-07 11:28:42 -07:00
crypto	crypto: sha512 - Expose generic sha512 routine to be callable from other modules	2013-04-25 21:00:57 +08:00
drm	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2013-05-02 19:40:34 -07:00
dt-bindings	ARM: dt: create a DT header for the GIC	2013-04-05 12:23:24 -06:00
keys
linux	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2013-06-12 15:39:05 -04:00
math-emu
media	Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2013-05-01 09:57:04 -07:00
memory
misc
net	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2013-06-12 15:39:05 -04:00
pcmcia
ras
rdma
rxrpc
scsi	Merge branch 'postmerge' into for-linus	2013-05-10 07:54:01 -07:00
sound	sound fixes for v3.10-rc1	2013-05-10 07:51:56 -07:00
target	iscsi-target: Add iscsit_transport API template	2013-04-25 01:05:26 -07:00
trace	f2fs updates for v3.10	2013-05-08 15:11:48 -07:00
uapi	{nl,cfg}80211: make peer link expiration time configurable	2013-06-11 14:16:29 +02:00
video	Merge branch 'late/clksrc' into late/cleanup	2013-05-06 23:43:45 +02:00
xen	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-05-01 14:08:52 -07:00
Kbuild	UAPI: remove empty Kbuild files	2013-04-30 17:04:09 -07:00