[PULL] input config fixes

[Peter Hutterer]

Keith,

Please pull the input configuration fixes below. It's mainly Dan's work to
support two configuration directories instead of one, with the system config
being /usr/share/X11/xorg.conf.d and /etc/X11/xorg.conf.d (by default).

Two more patches in there, one being a simple crasher fix and a more
restrictive device matching for evdev devices.

The following changes since commit fae2819a9d885988bf4b8478ea59f183972fcfc3:
  Jesse Barnes (1):
        GLX/DRI2: expose swap control extensions if DDX support is present

are available in the git repository at:

  git://people.freedesktop.org/~whot/xserver.git for-keith

Dan Nicholson (5):
      xfree86: Allow adding sysconfdir and datadir to config search paths
      xfree86: Document how -configdir affects the xorg.conf.d search path
      xfree86: Set a saner search path for xorg.conf.d
      xfree86: Search for a system xorg.conf.d
      Move 10-evdev.conf to system config dir $datadir/X11/xorg.conf.d

Peter Hutterer (1):
      config: only match sane devices in 10-evdev.conf

Pierre-Loup A. Griffais (1):
      Don't keep a pointer to a possibly freed cursor when changing screens, preventing a crash in xf86CursorEnableDisableFBAccess() trying to restore it.

 config/10-evdev.conf                 |   36 +++++++++++++++++++++++-
 config/Makefile.am                   |    2 +-
 configure.ac                         |    2 +
 cpprules.in                          |    1 +
 hw/xfree86/common/xf86Config.c       |   28 +++++++++---------
 hw/xfree86/doc/man/xorg.conf.man.pre |   50 +++++++++++++++++++++++++++------
 hw/xfree86/parser/Makefile.am        |    4 ++-
 hw/xfree86/parser/scan.c             |   14 +++++++++
 hw/xfree86/ramdac/xf86Cursor.c       |    1 +
 xorg-server.pc.in                    |    2 +
 10 files changed, 113 insertions(+), 27 deletions(-)