| commit | 330bcd2f7bd1e2e66d54bf95adca0795b262469f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 06 11:32:37 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 06 11:32:37 2008 -0700 |
| tree | 6e8773de9b202830609ed7fddc4e66a89c70e5ec | |
| parent | 156a9ea43acb609ac89d48dbb9f0d05ee903a12e [diff] | |
| parent | 868e15dbd2940f9453b4399117686f408dc77299 [diff] |
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: sound: emu10k1 - fix system hang with Audigy2 ZS Notebook PCMCIA card