Merge branch 'upstream' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 10 Aug 2010 06:50:39 +0000 (08:50 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 10 Aug 2010 06:50:39 +0000 (08:50 +0200)

Trivial merge