From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Fri, 11 Dec 2009 12:09:14 +0000 (+0000)
Subject: Merge branch 'master' of git://git.uk.xensource.com/xenclient/xen-pq
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=87885de98a72f62a3ffeb81a8216cacf35804655;p=xenclient%2Fxen-pq.git

Merge branch 'master' of git://git.uk.xensource.com/xenclient/xen-pq

Conflicts:

	master/series
---

87885de98a72f62a3ffeb81a8216cacf35804655
diff --cc master/series
index 00ca760,2482160..84e635c
--- a/master/series
+++ b/master/series
@@@ -30,4 -30,5 +30,6 @@@ filter-igfx-i
  hack-vbe-dont-check-mem
  hp-host-resume-workaround
  cope-with-dead-serial
+ reset-atapi-after-failed-cd-boot
+ fix-build-race
 +vga-edid