Merge branch 'for-linus' of git://github.com/tiwai/sound
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Sep 2011 19:04:32 +0000 (12:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Sep 2011 19:04:32 +0000 (12:04 -0700)
commit0acf043e89afa5181c30cba4d7e0a92e913cb096
tree8177d2fb2db75896b28f10e2d223fa964cc29bf8
parentd942e43b58dc27b36305bcd374a74f7cc15183a3
parent3127b6aa752d1329dbd79f669b53027905d1976a
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