[PULL] new Floating option, xorg.conf fixes

[Peter Hutterer]

Keith,

Please pull the below. The DGA patch has never seen any review love (despite
being on the list 2 or 3 times) but it's harmless. This set adds the new
"Floating" option for devices instead of the now-deprecated SendCoreEvents
option.

The last two in this list fix a nasty bug, since input ABI 12 all options
set for statically configured xorg.conf devices got lost during the device
initialisation process.

The following changes since commit 311cad33155c64ed996418808727fc417168592e:

  Fix Xdmx and Xephyr build when DTrace support is enabled (2010-12-02 16:56:30 -0800)

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

Eoghan Sherry (1):
      Xi: Fix master button update when slave buttons are mapped. #24887

Peter Hutterer (5):
      dix: don't stop processing valuators when the mode changes.
      mi: handle DGA subtypes when determining the master device.
      xfree86: add option "Floating", deprecate SendCoreEvents and friends.
      xfree86: don't overwrite option list (#32115)
      xfree86: use xf86AllocateInput() for xorg.conf devices too.

 Xi/exevents.c                        |    6 +++-
 dix/eventconvert.c                   |    8 -----
 hw/xfree86/common/xf86Config.c       |    5 ++-
 hw/xfree86/common/xf86Xinput.c       |    5 ++-
 hw/xfree86/common/xf86Xinput.h       |    1 +
 hw/xfree86/doc/devel/Registry        |    1 +
 hw/xfree86/doc/man/xorg.conf.man.pre |   48 +++++++++++++++++++++------------
 mi/mieq.c                            |    8 +++++-
 8 files changed, 49 insertions(+), 33 deletions(-)