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

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-10-08 07:14:06 +09:00

asm-generic

UAPI: Remove empty non-UAPI Kbuild files

2012-10-17 12:31:15 +01:00

clocksource

arm64: Generic timers support

2012-09-17 13:42:20 +01:00

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

KEYS: Asymmetric key pluggable data parsers

2012-10-08 13:50:13 +10:30

linux

Merge 3.7-rc6 into usb-next.

2012-11-16 18:46:21 -08:00

math-emu

…

media

Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next

2012-10-07 21:06:33 +10:00

memory

ddr: add LPDDR2 data from JESD209-2

2012-05-02 00:04:06 -07:00

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

RAS: Add a tracepoint for reporting memory controller events

2012-06-11 11:55:52 -03:00

rdma

infiniband: pass rdma_cm module to netlink_dump_start

2012-10-07 00:30:56 -04:00

rxrpc

…

scsi

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

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

target: Add target_submit_cmd_map_sgls for SGL fabric memory passthrough

2012-10-02 14:16:08 -07:00

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

Merge tag 'fbdev-updates-for-3.7' of git://github.com/schandinat/linux-2.6

2012-10-12 10:21:02 +09:00

xen

Merge tag 'stable/for-linus-3.7-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2012-11-10 06:56:21 +01:00

Kbuild

UAPI: Remove empty non-UAPI Kbuild files

2012-10-17 12:31:15 +01:00