34 +0100
committer Takashi Iwai <tiwai@suse.de> 1294904234 +0100

Merge branch 'topic/misc' into for-linus