From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 20 May 2010 10:00:43 +0000 (+0200)
Subject: Merge branch 'topic/asoc' into for-linus
X-Git-Tag: v2.6.35-rc1~478^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d71f4cece4bd97d05592836202fc04ff2e7817e3;p=pandora-kernel.git

Merge branch 'topic/asoc' into for-linus

Conflicts:
	sound/soc/codecs/ad1938.c
---

d71f4cece4bd97d05592836202fc04ff2e7817e3
Reading git-diff-tree failed