[PULL] Fedora patch merge

[Adam Jackson]

Merges some patches I've had sitting in the Fedora tree for too long.
Should be pretty uncontroversial.  Thanks to Alan Coopersmith for
checking my work on the multilib fix.

---

The following changes since commit db687f718f760ba254ab51994769db101dc9ca3a:
  Peter Hutterer (1):
        xkb: sed True -> TRUE and False -> FALSE

are available in the git repository at:

  git://people.freedesktop.org/~ajax/xserver.git fedora-merge

Adam Jackson (3):
      os: Add -displayfd option.
      xfree86: If the driver found modes on an output, don't add more
      xfree86: Fix the sdk headers to be multilib-safe

 dix/globals.c               |    1 +
 doc/Xserver.man.pre         |    7 ++++
 hw/xfree86/modes/xf86Crtc.c |    5 ++-
 include/colormapst.h        |    4 +-
 include/opaque.h            |    1 +
 include/xorg-server.h.in    |    7 ++--
 os/connection.c             |   72 +++++++++++++++++++++++++++++--------------
 os/utils.c                  |   11 ++++++
 8 files changed, 79 insertions(+), 29 deletions(-)

- ajax
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
Url : http://lists.x.org/archives/xorg-devel/attachments/20100208/fb65272a/attachment.pgp