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

Merge branch 'for-linus' into for-next

Conflicts:
	sound/pci/hda/hda_codec.c

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

ddf83485d7da468251716b8040bac1280622181e
Reading git-diff-tree failed