From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 28 Aug 2012 16:26:59 +0000 (-0700)
Subject: Merge branch 'for-linus' into for-next
X-Git-Tag: v3.7-rc1~81^2~65
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a184d4e4591bb53fd8b91d6e8b85cffa261fb83e;p=pandora-kernel.git

Merge branch 'for-linus' into for-next

Need to merge the fixes regarding EPSS.

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

a184d4e4591bb53fd8b91d6e8b85cffa261fb83e
Reading git-diff-tree failed