From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 May 2011 19:41:30 +0000 (-0700)
Subject: Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
X-Git-Tag: firefly_0821_release~7613^2~1450
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ca1376d10810bc2c20c8d0821a9ee04ca2507c01;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fix/asoc' of git://git./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
---

ca1376d10810bc2c20c8d0821a9ee04ca2507c01