From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 15 Jun 2015 11:15:48 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~113^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88f1236bfa9586ca458b67abde8ce91665bba079;p=pandora-kernel.git

Merge branch 'for-linus' into for-next

Conflicts:
	sound/pci/hda/patch_realtek.c

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

88f1236bfa9586ca458b67abde8ce91665bba079
Reading git-diff-tree failed