tree 5575a8dcce6d00ef702257cdb7027f603c4df3f7
parent 0c5e1577f1108e88475ca7b7ca75c411460173e1
parent 61bf35b9a3eab961ee1249467d9b2ac11d3c34c1
author Linus Torvalds <torvalds@linux-foundation.org> 1305229290 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1305229290 -0700

Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ASoC: WM8903: Fix Digital Capture Volume range
  ASoC: UDA134x: Remove POWER_OFF_ON_STANDBY define.
  ASoC: SSM2602: Fix reg_cache_size
  ASoC: SSM2602: Fix 'Mic Boost2' control
  ASoC: SSM2602: Properly annotate i2c probe and remove functions
  ASoC: sst_platform: add hw_free callback to fix resource leak
  ASoC: Don't crash on PM operations
  ASoC: JZ4740: Fix i2s shutdown