Merge branch 'for-3.12' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 15 Jul 2013 10:09:28 +0000 (12:09 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 15 Jul 2013 10:09:28 +0000 (12:09 +0200)

Trivial merge