From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 25 Oct 2010 08:00:30 +0000 (+0200)
Subject: Merge branch 'topic/asoc' into for-linus
X-Git-Tag: v2.6.37-rc1~126^2~1
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa5c14d5c0d3e4c587db4a1b220b9c86415c538f;p=pandora-kernel.git

Merge branch 'topic/asoc' into for-linus

Conflicts:
	arch/powerpc/platforms/85xx/p1022_ds.c
---

aa5c14d5c0d3e4c587db4a1b220b9c86415c538f
Reading git-diff-tree failed