Greg Kroah-Hartman d210267741 Merge 3.4-rc5 into staging-next ...

This resolves the conflict in:
	drivers/staging/vt6656/ioctl.c

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

2012-05-02 11:48:07 -07:00

..

acpi

…

asm-generic

asm-generic: Allow overriding clock_t and add attributes to siginfo_t

2012-04-23 16:29:18 -07:00

crypto

…

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-rc5 into staging-next

2012-05-02 11:48:07 -07:00

math-emu

…

media

…

misc

…

mtd

…

net

net/sock.h: fix sk_peek_off kernel-doc warning

2012-04-17 22:32:00 -04:00

pcmcia

…

rdma

…

rxrpc

…

scsi

SCSI: Fix error handling when no ULD is attached

2012-04-15 11:08:53 -07: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

…

xen

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

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

Kbuild

…