aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-02-01 14:21:09 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-02-01 14:21:09 +0000
commit2cfec93fecc086c5af3c58ad15b7841f36af205c (patch)
treeac49a9397442c10e3c9106357bf2c9d8bccb9e46 /sound/soc/codecs
parentf9eabc3deedccf545bd73fd72b3af2759d44f6f3 (diff)
parentf019ee5feb344ff0b22b58df4568676295aae14f (diff)
parent47f5ae51f2aedac2f3006c1252f1020fdfc1d3c0 (diff)
Merge branches 'for-2.6.38' and 'tegra-arch' into for-2.6.39