[xorg-x11-server/f21: 2/2] Merge remote-tracking branch 'origin/master' into f21

Fri Oct 3 13:12:05 UTC 2014

commit 77d0978458408605207e571c000e1bc7aef7483c
Merge: f9e5e85 c4ba930
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Oct 3 15:11:47 2014 +0200

    Merge remote-tracking branch 'origin/master' into f21

 ...lback-to-first-platform-device-as-primary.patch |   74 -------------------
 ...-xfree86-Allow-non-PCI-devices-as-primary.patch |   37 ----------
 patchwork-33052.patch                              |   77 --------------------
 sources                                            |    2 +-
 xorg-x11-server.spec                               |   15 ++---
 5 files changed, 6 insertions(+), 199 deletions(-)
---