diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 11:33:59 +0000 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-27 15:18:19 -0700 |
| commit | a754a87ce8b17024358c1be8ee0232ef09a7055f (patch) | |
| tree | c0d4adee8f490828ca04cd45d6fbb13596d88322 /arch/arm/mach-s5pv210 | |
| parent | 70688056a8b4d610249716befe262a74fd123d90 (diff) | |
| parent | 22f8d055350066b4a87de4adea8c5213cac54534 (diff) | |
| download | linux-3.10-a754a87ce8b17024358c1be8ee0232ef09a7055f.tar.gz linux-3.10-a754a87ce8b17024358c1be8ee0232ef09a7055f.tar.bz2 linux-3.10-a754a87ce8b17024358c1be8ee0232ef09a7055f.zip | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into next/boards
The asoc branch that was already merged into v3.4 contains some
board-level changes that conflict with patches we already have
here, so pull in that branch to resolve the conflicts.
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
arch/arm/mach-omap2/board-omap4panda.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[olof: Amended fix for mismerge as reported by Kevin Hilman]
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-s5pv210')
0 files changed, 0 insertions, 0 deletions