From 550b2a93297233dab6075ce2b432279178d1b185 Mon Sep 17 00:00:00 2001
From: Santiago Gimeno <santiago.gimeno@quantion.es>
Date: Fri, 21 Mar 2014 12:21:00 +0100
Subject: [PATCH] Merge branch 'master', remote branch 'upstream/master'

* upstream/master:
  Add some REGION-related XFIXES requests
  Add GetCrtcInfo and fix in GetScreenResources

* master: