Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jun 2008 18:32:37 +0000 (11:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jun 2008 18:32:37 +0000 (11:32 -0700)
commit330bcd2f7bd1e2e66d54bf95adca0795b262469f
tree6e8773de9b202830609ed7fddc4e66a89c70e5ec
parent156a9ea43acb609ac89d48dbb9f0d05ee903a12e
parent868e15dbd2940f9453b4399117686f408dc77299
Merge branch 'for-linus' of git://git./linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  sound: emu10k1 - fix system hang with Audigy2 ZS Notebook PCMCIA card