Merge branch 'for-3.0' into for-3.1
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 4 Jul 2011 15:54:40 +0000 (08:54 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 4 Jul 2011 15:54:40 +0000 (08:54 -0700)
commit469bb638dc2a6ea87ea56256f25cc964deb3cf2b
tree882c6a76805a4f705d5a29ff58c71f93ede4b395
parentb5f9cfed12dc639cce5a8b6e741352980e05a8a9
parent8e9ddf811ba021506d2316fcfe619faa0ab3f567
Merge branch 'for-3.0' into for-3.1
sound/soc/codecs/wm8994.c
sound/soc/tegra/tegra_i2s.c