Merge branch 'for-linus' into test/usb-resume
authorTakashi Iwai <tiwai@suse.de>
Thu, 20 Nov 2014 20:46:04 +0000 (21:46 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 20 Nov 2014 20:46:04 +0000 (21:46 +0100)

Trivial merge