From: David Woodhouse <David.Woodhouse@intel.com>
Date: Thu, 9 Jul 2009 21:53:24 +0000 (+0100)
Subject: Merge branch 'from-kernel' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2... 
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e99eb076a09c6ca5f5bf728c50ef602e7f6e5b70;hp=e99eb076a09c6ca5f5bf728c50ef602e7f6e5b70;p=linux-firmware

Merge branch 'from-kernel' of git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware

Conflicts:
	WHENCE
---