diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-15 15:56:40 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-15 15:56:40 +0200 |
| commit | ec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1 (patch) | |
| tree | c7fcfd4ad7ad1875e611db3a2bd75d64f603c355 /arch/arm/mach-omap2/board-ldp.c | |
| parent | ASoC: Automatically manage WM8580 DAC OSR (diff) | |
| parent | MAINTAINERS: Add Ian Lartey as comaintaner for Wolfson devices (diff) | |
| download | linux-ec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1.tar.xz linux-ec62dbd7eb8e3dddb221da89ecbcea0fc3dee8c1.zip | |
Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.37
Trivial overlap with the removal of the local revision variable.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
0 files changed, 0 insertions, 0 deletions