[PULL 1.15] pnpid and two other fixes

[Peter Hutterer]

The PnPID fix is nice to have to support the new lenovos OOTB in 1.15.

The following changes since commit b332cd20ee14049606e3656490d13a8efa6b23ee:

  Merge branch 'server-1.15-branch' of git://people.freedesktop.org/~jeremyhu/xserver into server-1.15-branch (2014-03-06 22:03:03 -0700)

are available in the git repository at:


  git://people.freedesktop.org/~whot/xserver server-1.15-branch

for you to fetch changes up to c971864565eb114e4b34f17b0d2244e8e6e1e005:

  config: search for PnPID on all parents (#75513) (2014-03-13 08:29:46 +1000)

----------------------------------------------------------------
Mark Kettenis (1):
      sync: Avoid ridiculously long timeouts

Peter Hutterer (2):
      Xi: check for invalid modifiers for XI2 passive grabs
      config: search for PnPID on all parents (#75513)

 Xext/sync.c        |  7 ++-----
 Xi/exevents.c      |  3 ++-
 Xi/xipassivegrab.c |  4 ++++
 config/hal.c       | 16 +++++++++++++---
 config/udev.c      | 15 +++++++++++----
 5 files changed, 32 insertions(+), 13 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140313/18225924/attachment.pgp>