From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 27 Oct 2014 13:11:07 +0000 (+0100)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: omap-for-v3.19/fixes-rc1~126^2~21^2~102
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85c24cd8d3676cbae9e8809e894e68025c6d497e;p=pandora-kernel.git

Merge branch 'for-linus' into for-next

Merged upstream branch to make further fireworks development easier
(and avoid conflicts earlier).

Conflicts:
	sound/firewire/bebob/bebob_focusrite.c
---

85c24cd8d3676cbae9e8809e894e68025c6d497e
Reading git-diff-tree failed