diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-06-09 12:15:10 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-06-09 12:15:10 +0200 |
| commit | 6e03a61544c368c2c3ff946c1ce7807e5c36a527 (patch) | |
| tree | 29253331da9680b5f81ba8715202044f45861666 /sound/soc/ep93xx | |
| parent | Merge branch 'for-2.6.36' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff) | |
| parent | EP93xx: Add i2s core support (diff) | |
| download | linux-6e03a61544c368c2c3ff946c1ce7807e5c36a527.tar.xz linux-6e03a61544c368c2c3ff946c1ce7807e5c36a527.zip | |
Merge branch 'ep93xx' into for-2.6.36
Trivial add/add fixup required in the clock table.
Conflicts:
arch/arm/mach-ep93xx/clock.c
Diffstat (limited to 'sound/soc/ep93xx')
0 files changed, 0 insertions, 0 deletions