Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 19 Sep 2013 16:46:43 +0000 (18:46 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 19 Sep 2013 16:46:43 +0000 (18:46 +0200)

Trivial merge