xf86-input-mouse: Changes to 'master'

[Alan Coopersmith]

 src/mouse.c     |    8 ++++----
 src/sun_mouse.c |    8 +++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 7bb5cbecbcc24f20467546f957fb95c9190514c0
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jul 25 21:11:50 2011 -0700

    sun_mouse.c: Ensure vuidMouse setup routines are called for protocol "Auto"
    
    Fixes regression caused by commit b12fa0d5ab23 in which devices with
    protocol "Auto" (generally just PS/2 devices on Solaris, since HAL
    sets protocol "VUID" for USB devices already) weren't going through
    vuidMousePreInit and setting up the device_control & read_input pointers
    to the routines which know how to decode VUID packets.
    
    Adds a check to vuidPreInit to ensure we don't leak memory if called
    twice for the same device, just in case I missed a code path, or a
    new one appears in the future.
    
    Fixes Solaris bug 7070321: Mouse protocol "Auto" does not work in build 170
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Acked-by: Peter Hutterer <peter.hutterer at who-t.net>

commit 94fb2250b12fbaf840352b83dd9f832319c92b0f
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Jul 25 20:40:03 2011 -0700

    No need to merge NULL options list with existing options
    
    Appending NULL to an existing options list simply walks the entire
    existing list before returning it unchanged, so if we aren't creating
    a new list to merge, don't bother merging it either.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>