From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 13 Apr 2010 10:57:59 +0000 (+0200)
Subject: Merge branch 'topic/core-cleanup' into for-next
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e04201e9b28b1214bc19bdf7077af2206c4d29a9;p=pandora-kernel.git

Merge branch 'topic/core-cleanup' into for-next

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

e04201e9b28b1214bc19bdf7077af2206c4d29a9
Reading git-diff-tree failed