Mark Brown d5efccd5b6 ASoC: Merge tag 'v3.4-rc3' into for-3.5 ...

Linux 3.4-rc3 contains a bunch of Tegra changes which are conflicting
annoyingly with the new development that's going on for Tegra so merge
it up to resolve those conflicts.

Conflicts:
	sound/soc/soc-core.c
	sound/soc/tegra/tegra_i2s.c
	sound/soc/tegra/tegra_spdif.c

2012-04-16 19:40:27 +01: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

ASoC: Merge tag 'v3.4-rc3' into for-3.5

2012-04-16 19:40:27 +01: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

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

ASoC: Merge tag 'v3.4-rc3' into for-3.5

2012-04-16 19:40:27 +01: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

…