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, 22 May 2009 20:38:52 +0000 (13:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 May 2009 20:38:52 +0000 (13:38 -0700)
commit2528ed119b8f4fc553f9d1e65719ae183ffa97f4
tree8ca7caff8ab0c8f6d349cb0feab360e08a3cc3d9
parent6a44587ee716ac911082cbdec766e5b3f051c071
parent4986cab5551cd22e6a57d5e2511b80d38669e1ca
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:
  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