From: David Woodhouse <David.Woodhouse@intel.com>
Date: Sun, 19 Apr 2009 19:37:33 +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=3a9cf53b3ae80c3ba09dbe95233e5601f6340c1f;p=linux-firmware

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

Conflicts:
	WHENCE
---

3a9cf53b3ae80c3ba09dbe95233e5601f6340c1f