xf86-input-evdev: Changes to 'master'

[Peter Hutterer]

 src/evdev.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a9cdb6590cdf72917cdfeb17e2fcc6a110b2c7d1
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Nov 11 07:31:02 2011 +1000

    Move misplaced #endif caused by smooth-scrolling merge
    
    Bad conflict resolution in xf86-input-evdev-2.6.0-30-g745fca0
    
    Reported-by: Sebastian Glita <glseba at yahoo.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>