From: David Woodhouse <David.Woodhouse@intel.com>
Date: Wed, 6 Jan 2010 16:18:34 +0000 (+0000)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/dwmw2/linux... 
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c103430a955a286e459a658d6300557fb1d72ad4;hp=c103430a955a286e459a658d6300557fb1d72ad4;p=linux-firmware

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

Conflicts:
	WHENCE
---