xf86-input-joystick: Changes to 'master'

[Sascha Hlusiak]

 man/joystick.man |   31 +++++++++++++++++++++++++++----
 src/jstk.c       |   19 +++++++++++++------
 src/jstk_key.c   |    1 +
 3 files changed, 41 insertions(+), 10 deletions(-)

New commits:
commit b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f
Author: Sascha Hlusiak <saschahlusiak at arcor.de>
Date:   Sun Nov 13 20:36:07 2011 +0100

    Copy pInfo->driver to option list to fix hotplugging of keyboard device
    
    udev does copy the Driver line to the list of options, but when manually
    specifying the driver in xorg.conf, the option "Driver" is unset. Because we
    do hotplug a sub-device from within the core device, we need the "Driver"
    option to be present in the list.
    
    This should fix archlinux bug #23577:
      https://bugs.archlinux.org/task/23577
    
    Thanks to Malek for coming up with a fix.
    
    Signed-off-by: Sascha Hlusiak <contact at saschahlusiak.de>

commit 411c1838456c055d3f911c54ed58bb11a6bf0da3
Author: Sascha Hlusiak <saschahlusiak at arcor.de>
Date:   Sun Nov 13 18:04:25 2011 +0100

    man: valuators are not added automatically

commit 9bbb5775be4e7c72b6d51c20be33f5ed3fb7301a
Merge: b607c4ebeea4122694f02ba87f06e4cdb23114f1 7ccf3a75292d71104c976bf6afb389cccaac1a7d
Author: Sascha Hlusiak <saschahlusiak at arcor.de>
Date:   Sun Nov 13 17:10:09 2011 +0100

    Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/driver/xf86-input-joystick

commit b607c4ebeea4122694f02ba87f06e4cdb23114f1
Author: Sascha Hlusiak <saschahlusiak at arcor.de>
Date:   Sun Oct 16 00:47:52 2011 +0200

    label buttons and axes
    
    Buttons are labeled "Button %d", starting with 0 and representing the button in X _after_ mapping.
    Mapping can be changed while running so the labels will be constant.
    
    Axes are labeled "Axis %d", starting with 1, representing the _physical_ axis that reports the valuator
    data. The raw valuators can't be dynamically mapped, the first two valuators always are labeled "Rel X"
    and "Rel Y", representing the aggregated post-calculation data from all axes.
    
    Signed-off-by: Sascha Hlusiak <saschahlusiak at arcor.de>