Merge branch 'upstream' into topic/asoc
authorTakashi Iwai <tiwai@suse.de>
Mon, 1 Dec 2008 17:02:17 +0000 (18:02 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 1 Dec 2008 17:02:17 +0000 (18:02 +0100)

Trivial merge