From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 May 2009 15:47:53 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
X-Git-Tag: v2.6.30-rc8~23
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=44ada1a147fa28ae15b83a031c48fc2b992cc3ef;p=~emulex%2Finfiniband.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: hda - Compaq Presario CQ60 patching for Conexant
  sound: usb-audio: make the MotU Fastlane work again
  ALSA: Enable PCM hw_ptr_jiffies check only in xrun_debug mode
  ALSA: Fix invalid jiffies check after pause
---

44ada1a147fa28ae15b83a031c48fc2b992cc3ef