From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 22 May 2009 17:29:08 +0000 (+0200)
Subject: Merge branch 'fix/misc' into for-linus
X-Git-Tag: v2.6.30-rc7~4^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=4986cab5551cd22e6a57d5e2511b80d38669e1ca;p=linux-2.6-block.git

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
---

4986cab5551cd22e6a57d5e2511b80d38669e1ca