Merge branch 'fix/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 22 May 2009 17:29:08 +0000 (19:29 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 22 May 2009 17:29:08 +0000 (19:29 +0200)
commit4986cab5551cd22e6a57d5e2511b80d38669e1ca
treed0ddbeabecf035762cd76863494a6182968586ef
parent89b7161c48f4b7acd5cb70d7da6b3abf3fe982d1
parentafe6d7e3c4a9aba020637f4ae15527a89ba31f21
Merge branch 'fix/misc' into for-linus

* fix/misc:
  ALSA: Kill truncate warning by shortening Sigmatel-specific AC97 control name
  ALSA: pcsp - fix printk format warning again