[xorg-x11-server/f21] (7 commits) ...Merge remote-tracking branch 'origin/master' into f21

[Hans de Goede]

Summary of changes:

  ad57668... Fix xwayland conditionals to allow building on F-20 (rhbz#1 (*)
  a9ad36e... Really fix conditionals to allow building on F-20 (rhbz#112 (*)
  404ee1b... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_M (*)
  5556cee... re-add support for non pci platform devices (*)
  410f73f... drop no longer valid configure arguments (rhbz#1133350) (*)
  ccee953... Drop Fedora specific xorg-non-pci.patch, replace with solut (*)
  4c71cd1... Merge remote-tracking branch 'origin/master' into f21

(*) This commit already existed in another branch; no separate mail sent