From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 4 Jul 2014 05:48:57 +0000 (+0200)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~144^2~13^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a0e3f9639ebe7f0f17b40eb96d03c05ec067979;p=pandora-kernel.git

Merge branch 'for-linus' into for-next

Conflicts:
	sound/pci/hda/hda_intel.c
---

1a0e3f9639ebe7f0f17b40eb96d03c05ec067979
Reading git-diff-tree failed