Merge branch 'fix/asoc' of git://github.com/tiwai/sound
commita8062e421f8a5800c83b85ab10c4cefd8409844f
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Oct 2011 16:59:22 +0000 (4 09:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Oct 2011 16:59:22 +0000 (4 09:59 -0700)
tree7ca1bcf2529ff01c4759ac028bea02f8c562b5be
parent1fd2a850ecad717113cb36fa9d6e4304cd19b89d
parentb5c49d49b9e175fd56cb4b5cf2c4fd972d15e013
Merge branch 'fix/asoc' of git://github.com/tiwai/sound

* 'fix/asoc' of git://github.com/tiwai/sound:
  ASoC: omap_mcpdm_remove cannot be __devexit
  ASoC: Fix setting update bits for WM8753_LADC and WM8753_RADC
  ASoC: use a valid device for dev_err() in Zylonite