Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 27 Oct 2014 13:11:07 +0000 (14:11 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 27 Oct 2014 13:11:07 +0000 (14:11 +0100)
Merged upstream branch to make further fireworks development easier
(and avoid conflicts earlier).

Conflicts:
sound/firewire/bebob/bebob_focusrite.c


Trivial merge