From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 29 Apr 2015 05:28:29 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: omap-for-v4.3/legacy-v2-signed~142^2~109
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49c4a4c5244d2c1a25ec1e01dbb4fba3813d237d;p=pandora-kernel.git

Merge branch 'for-linus' into for-next

Conflicts:
	sound/pci/emu10k1/emu10k1_main.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

49c4a4c5244d2c1a25ec1e01dbb4fba3813d237d
Reading git-diff-tree failed