author | Linus Torvalds <torvalds@linux-foundation.org> | |
Tue, 4 Oct 2011 16:59:22 +0000 (09:59 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Tue, 4 Oct 2011 16:59:22 +0000 (09:59 -0700) |
* '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
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
Trivial merge