[PULL] input fixes

[Peter Hutterer]

nothing exciting. cleanup patches, fix for 21457 and a rather important
bugfix that stopped xorg.conf XKB layouts from being applied.

The following changes since commit 2c70b650b342378898064cf27e2f95c4b2e53d24:

  Fix Xwin build after af0f9f91 (2010-12-08 11:48:21 -0800)

are available in the git repository at:
  git://people.freedesktop.org/~whot/xserver.git for-keith

Peter Hutterer (5):
      dix: clear up an overly convoluted if statement.
      xfree86: don't set movement flags for non-valuator events.
      dix: allow for button-only input devices (#21457)
      xfree86: swap the order to-be-merged lists in xf86CollectInputOptions.
      xfree86: always report the input options before initialising the device.

 dix/getevents.c                |   60 ++++++++++++++++++++++++---------------
 hw/xfree86/common/xf86Option.c |    2 +-
 hw/xfree86/common/xf86Xinput.c |   23 ++++++++++-----
 3 files changed, 53 insertions(+), 32 deletions(-)