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

..

boot

powerpc/dts: Removed fsl,msi property from dts.

2012-03-29 08:14:15 -05:00

configs

Merge tag 'v3.4-rc2' into for-3.5

2012-04-09 11:53:45 +01:00

include/asm

irq: Kill pointless irqd_to_hw export

2012-04-10 22:39:17 -06:00

kernel

Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6

2012-04-12 12:49:56 -07:00

kvm

KVM: PPC: Book3S: PR: Fix preemption

2012-04-03 16:42:39 +10:00

lib

Disintegrate asm/system.h for PowerPC

2012-03-28 18:30:02 +01:00

math-emu

powerpc/math_emu/efp: Look for errata handler when type mismatches

2011-10-06 23:36:47 -05:00

mm

Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system

2012-03-28 15:58:21 -07:00

net

…

oprofile

Disintegrate asm/system.h for PowerPC

2012-03-28 18:30:02 +01:00

perf

powerpc/perf: Fix instruction address sampling on 970 and Power4

2012-03-28 11:33:24 +11:00

platforms

irq_domain: Move irq_virq_count into NOMAP revmap

2012-04-12 00:37:48 -06:00

sysdev

Merge remote-tracking branch 'kumar/next' into merge

2012-04-02 13:57:46 +10:00

xmon

Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system

2012-03-28 15:58:21 -07:00

Kconfig

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

2012-03-29 16:53:48 -07:00

Kconfig.debug

irqdomain: Remove powerpc dependency from debugfs file

2012-03-29 14:31:02 -06:00

Makefile

powerpc/perf: Move perf core & PMU code into a subdirectory

2012-02-23 10:50:04 +11:00

relocs_check.pl

powerpc: Process dynamic relocations for kernel

2011-12-20 10:21:08 -05:00