Jiri Kosina 56ccd186f1 Merge branch 'upstream' into for-linus ...

Conflicts:
	drivers/hid/hid-core.c

2012-05-22 11:32:31 +02:00

..

acpi

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

2012-03-30 16:45:39 -07:00

asm-generic

asm-generic: add linux/types.h to cmpxchg.h

2012-04-02 14:41:27 -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 branch 'upstream' into for-linus

2012-05-22 11:32:31 +02:00

math-emu

…

media

…

misc

…

mtd

…

net

mac80211: Convert WARN_ON to WARN_ON_ONCE

2012-04-09 15:54:48 -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

…