diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 12:33:59 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-28 00:18:19 +0200 |
| commit | a754a87ce8b17024358c1be8ee0232ef09a7055f (patch) | |
| tree | c0d4adee8f490828ca04cd45d6fbb13596d88322 /drivers/gpu/drm/radeon/radeon_mode.h | |
| parent | Merge branch 'for-3.4/boards' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | ASoC: wm8994: Provide VMID mode control and fix default sequence (diff) | |
| download | linux-a754a87ce8b17024358c1be8ee0232ef09a7055f.tar.xz linux-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 'drivers/gpu/drm/radeon/radeon_mode.h')
0 files changed, 0 insertions, 0 deletions