From: David Woodhouse <David.Woodhouse@intel.com>
Date: Mon, 6 Apr 2009 21:22:39 +0000 (-0700)
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=a652b0792187224ddd3ac424c38d34fc6d28c496;hp=a652b0792187224ddd3ac424c38d34fc6d28c496;p=linux-firmware

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

Conflicts:
	WHENCE
---