From: David Woodhouse <David.Woodhouse@intel.com>
Date: Wed, 17 Mar 2010 20:39:53 +0000 (+0000)
Subject: Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c3ff02adff5f8d492535ae78bf294b5c06baeac;hp=8c3ff02adff5f8d492535ae78bf294b5c06baeac;p=linux-firmware

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

Conflicts:
	WHENCE
---