Merge branch 'for-2.6.38' into for-2.6.39
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 9 Feb 2011 22:52:08 +0000 (22:52 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 9 Feb 2011 22:52:08 +0000 (22:52 +0000)
commit866fd9366a5b2c7d17eb10f7e7b1c17393ed0beb
tree51b384c53fdb6c89c09efafeaeec701c25444572
parente12adab00222817213fcdc68c5fd6ee2e5dfb247
parentb66a70d5e9929f3b0df5a7177bba75652d2f4c3e
Merge branch 'for-2.6.38' into for-2.6.39
sound/soc/soc-dapm.c