diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-23 12:04:32 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-23 12:04:32 -0700 | 
| commit | 0acf043e89afa5181c30cba4d7e0a92e913cb096 (patch) | |
| tree | 8177d2fb2db75896b28f10e2d223fa964cc29bf8 /lib/timerqueue.c | |
| parent | d942e43b58dc27b36305bcd374a74f7cc15183a3 (diff) | |
| parent | 3127b6aa752d1329dbd79f669b53027905d1976a (diff) | |
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
Diffstat (limited to 'lib/timerqueue.c')
0 files changed, 0 insertions, 0 deletions
