Merge branch 'topic/next' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 3 Aug 2012 10:59:38 +0000 (12:59 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 3 Aug 2012 10:59:38 +0000 (12:59 +0200)

Trivial merge