Greg Kroah-Hartman 0c864d8b3e Merge 3.7-rc6 into usb-next. ... This resolves a conflict with these files: drivers/usb/early/ehci-dbgp.c drivers/usb/host/ehci-ls1x.c drivers/usb/host/ohci-xls.c drivers/usb/musb/ux500.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-11-16 18:46:21 -08:00
..
acpi
asm-generic	UAPI: Remove empty non-UAPI Kbuild files	2012-10-17 12:31:15 +01: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	drm/radeon: add some new SI PCI ids	2012-10-23 10:23:49 -04:00
keys
linux	Merge 3.7-rc6 into usb-next.	2012-11-16 18:46:21 -08:00
math-emu
media
memory
misc
net	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211	2012-10-29 14:14:48 -04:00
pcmcia
ras
rdma
rxrpc
scsi	SCSI misc on 20121012	2012-10-13 10:57:01 +09:00
sound	ALSA: Add a reference counter to card instance	2012-10-30 11:07:10 +01:00
target
trace	xen/mmu: Use Xen specific TLB flush instead of the generic one.	2012-10-31 12:38:31 -04:00
uapi	mm, oom: reintroduce /proc/pid/oom_adj	2012-11-16 10:15:35 -08:00
video	fbdev updates for 3.7	2012-10-12 10:21:02 +09:00
xen	Bug-fixes:	2012-11-10 06:56:21 +01:00
Kbuild	UAPI: Remove empty non-UAPI Kbuild files	2012-10-17 12:31:15 +01:00