diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-01 15:21:09 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-02-01 15:21:09 +0100 |
commit | 2cfec93fecc086c5af3c58ad15b7841f36af205c (patch) | |
tree | ac49a9397442c10e3c9106357bf2c9d8bccb9e46 /arch/arm | |
parent | ASoC: Tegra: Harmony: Remove redundant !! (diff) | |
parent | ASoC: CX20442: fix NULL pointer dereference (diff) | |
parent | ARM: tegra: Add to struct harmony_audio_platform_data (diff) | |
download | linux-2cfec93fecc086c5af3c58ad15b7841f36af205c.tar.xz linux-2cfec93fecc086c5af3c58ad15b7841f36af205c.zip |
Merge branches 'for-2.6.38' and 'tegra-arch' into for-2.6.39