Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: ad714x - read the interrupt status registers in a row
  Input: ad714x - use DMA-safe buffers for spi_write()
  Input: ad714x - fix endianness issues
  Input: ad714xx-spi - force SPI bus into the default 8-bit mode
  Input: ep93xx_keypad - add missing include of linux/module.h
  Input: tnetv107x-ts - add missing include of linux/module.h
  Input: max11801_ts - correct license statement
  Input: atmel_mxt_ts - report pressure information from the driver
  Input: bcm5974 - Add support for newer MacBookPro8,2
  Input: wacom - report id 3 returns 4 bytes of data
  Input: wacom - add WAC_MSG_RETRIES define
  Input: wacom - add support for the Wacom Bamboo Pen (CTL-660/K)
  Input: tegra-kbc - correct call to input_free_device
  Input: mpu3050 - correct call to input_free_device
  Input: bcm5974 - add support for touchpads found in MacBookAir4,2
  Input: mma8450 - fix module device table type
  Input: remove CLOCK_TICK_RATE from analog joystick driver

diff --cc drivers/input/joystick/analog.c
index 9882971,c021317..358cd7e
--- 1/drivers/input/joystick/analog.c
--- 2/drivers/input/joystick/analog.c
+++ b/drivers/input/joystick/analog.c
@@@ -136,10 -136,10 +136,10 @@@ struct analog_port 
  
  #ifdef __i386__
  
 -#include <asm/i8253.h>
 +#include <linux/i8253.h>
  
  #define GET_TIME(x)   do { if (cpu_has_tsc) rdtscl(x); else x = get_time_pit(); } while (0)
- #define DELTA(x,y)    (cpu_has_tsc ? ((y) - (x)) : ((x) - (y) + ((x) < (y) ? CLOCK_TICK_RATE / HZ : 0)))
+ #define DELTA(x,y)    (cpu_has_tsc ? ((y) - (x)) : ((x) - (y) + ((x) < (y) ? PIT_TICK_RATE / HZ : 0)))
  #define TIME_NAME     (cpu_has_tsc?"TSC":"PIT")
  static unsigned int get_time_pit(void)
  {