From: Takashi Iwai <tiwai@suse.de>
Date: Sun, 17 Oct 2010 08:14:41 +0000 (+0200)
Subject: Merge branch 'topic/asoc' into for-next
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ad718a70f54a52a324e0fbc602bf2e94620017f;p=pandora-kernel.git

Merge branch 'topic/asoc' into for-next

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

7ad718a70f54a52a324e0fbc602bf2e94620017f
Reading git-diff-tree failed