tree cc3e7681c9ccd94e179b81639de4fb829c430af9
parent 57119327df3a824dc9a59973d3db7e5bdd2e75cc
parent 0fac25908f8e26a27d869f0aa4fad04c3db60dc7
author Linus Torvalds <torvalds@linux-foundation.org> 1317163581 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1317163581 -0700

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

* 'for-linus' of git://github.com/tiwai/sound:
  ASoC: ssm2602: Re-enable oscillator after suspend
  ALSA: usb-audio: Check for possible chip NULL pointer before clearing probing flag
  ALSA: hda/realtek - Don't detect LO jack when identical with HP
  ALSA: hda/realtek - Avoid bogus HP-pin assignment
  ALSA: HDA: No power nids on 92HD93
  ASoC: omap-mcbsp: Do not attempt to change DAI sysclk if stream is active