From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 12 Jan 2010 08:40:08 +0000 (+0100)
Subject: Merge commit alsa/devel into topic/misc
X-Git-Tag: v2.6.34-rc1~243^2~2^2~13^2~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a29fb94ff48cba620e1ac1317f5eef5920ead3ff;p=thirdparty%2Fkernel%2Flinux.git

Merge commit alsa/devel into topic/misc

Conflicts:
	include/sound/version.h
---

a29fb94ff48cba620e1ac1317f5eef5920ead3ff