From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Sep 2011 19:04:32 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://github.com/tiwai/sound
X-Git-Tag: v3.1-rc8~17
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=0acf043e89afa5181c30cba4d7e0a92e913cb096

Merge branch 'for-linus' of git://github.com/tiwai/sound

* 'for-linus' of git://github.com/tiwai/sound:
  ALSA: usb-audio - clear chip->probing on error exit
  ALSA: fm801: Gracefully handle failure of tuner auto-detect
  ALSA: fm801: Fix double free in case of error in tuner detection
  ASoC: Ensure we generate a driver name
  ASoC: Remove bitrotted wm8962_resume()
  ASoC: bf5xx-ad73311: Fix prototype for bf5xx_probe
---

0acf043e89afa5181c30cba4d7e0a92e913cb096