From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 25 Jun 2009 13:28:14 +0000 (+0200)
Subject: Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v2.6.31-rc2~66^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10121a12e2380fb34b6e646a8e367add06d036c3;p=pandora-kernel.git

Merge branch 'for-2.6.31' of git://git./linux/kernel/git/broonie/sound-2.6 into fix/asoc

Conflicts:
	MAINTAINERS
---

10121a12e2380fb34b6e646a8e367add06d036c3
Reading git-diff-tree failed