From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 26 Nov 2008 13:12:42 +0000 (+0100)
Subject: Merge branch 'topic/misc' into topic/pcsp-fix
X-Git-Tag: v2.6.29-rc1~590^2~9^2~3^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7dd8c1bdacf658b0ade51facb2f7eaf40eb0ac4;p=pandora-kernel.git

Merge branch 'topic/misc' into topic/pcsp-fix

Conflicts:
	sound/drivers/pcsp/pcsp_lib.c
---

e7dd8c1bdacf658b0ade51facb2f7eaf40eb0ac4
Reading git-diff-tree failed