summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-02-01 15:21:09 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-02-01 15:21:09 +0100
commit2cfec93fecc086c5af3c58ad15b7841f36af205c (patch)
treeac49a9397442c10e3c9106357bf2c9d8bccb9e46 /arch/arm
parentASoC: Tegra: Harmony: Remove redundant !! (diff)
parentASoC: CX20442: fix NULL pointer dereference (diff)
parentARM: tegra: Add to struct harmony_audio_platform_data (diff)
downloadlinux-2cfec93fecc086c5af3c58ad15b7841f36af205c.tar.xz
linux-2cfec93fecc086c5af3c58ad15b7841f36af205c.zip
Merge branches 'for-2.6.38' and 'tegra-arch' into for-2.6.39