tree 8ca7caff8ab0c8f6d349cb0feab360e08a3cc3d9
parent 6a44587ee716ac911082cbdec766e5b3f051c071
parent 4986cab5551cd22e6a57d5e2511b80d38669e1ca
author Linus Torvalds <torvalds@linux-foundation.org> 1243024732 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1243024732 -0700

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: Kill truncate warning by shortening Sigmatel-specific AC97 control name
  ALSA: hda - fix audio on HP TX25xx series notebooks
  ALSA: pcsp - fix printk format warning again