tree 7ca1bcf2529ff01c4759ac028bea02f8c562b5be
parent 1fd2a850ecad717113cb36fa9d6e4304cd19b89d
parent b5c49d49b9e175fd56cb4b5cf2c4fd972d15e013
author Linus Torvalds <torvalds@linux-foundation.org> 1317747562 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1317747562 -0700

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