Greg Kroah-Hartman 61906313bd Merge 3.4-rc6 into usb-next ...

This resolves the conflict with:
	drivers/usb/host/ehci-tegra.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-05-07 09:03:39 -07:00

..

acpi

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

2012-05-05 10:06:06 -07:00

asm-generic

asm-generic: Use __BITS_PER_LONG in statfs.h

2012-04-30 12:55:15 -07:00

crypto

crypto: user - Fix lookup of algorithms with IV generator

2012-03-29 19:52:47 +08:00

drm

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

2012-04-12 17:42:01 +01:00

keys

…

linux

Merge 3.4-rc6 into usb-next

2012-05-07 09:03:39 -07:00

math-emu

…

media

Merge tag 'device-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2012-03-24 10:41:37 -07:00

misc

…

mtd

…

net

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem

2012-05-01 14:14:05 -04:00

pcmcia

…

rdma

…

rxrpc

…

scsi

[SCSI] libsas, libata: fix start of life for a sas ata_port

2012-04-23 12:11:47 +01:00

sound

ALSA: hda - hide HDMI/ELD printks unless snd.debug=2

2012-04-10 14:53:55 +02:00

target

…

trace

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-04-04 10:04:42 -07:00

video

Merge branch 'platforms' of git://git.linaro.org/people/rmk/linux-arm

2012-03-27 18:17:02 -07:00

xen

Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2012-04-04 17:13:43 -07:00

Kbuild

…