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

Pull input subsystem updates from Dmitry Torokhov:
 "- we finally merged driver for USB version of Synaptics touchpads
    (I guess most commonly found in IBM/Lenovo keyboard/touchpad combo);

   - a bunch of new drivers for embedded platforms (Cypress
     touchscreens, DA9052 OnKey, MAX8997-haptic, Ilitek ILI210x
     touchscreens, TI touchscreen);

   - input core allows clients to specify desired clock source for
     timestamps on input events (EVIOCSCLOCKID ioctl);

   - input core allows querying state of all MT slots for given event
     code via EVIOCGMTSLOTS ioctl;

   - various driver fixes and improvements."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (45 commits)
  Input: ili210x - add support for Ilitek ILI210x based touchscreens
  Input: altera_ps2 - use of_match_ptr()
  Input: synaptics_usb - switch to module_usb_driver()
  Input: convert I2C drivers to use module_i2c_driver()
  Input: convert SPI drivers to use module_spi_driver()
  Input: omap4-keypad - move platform_data to <linux/platform_data>
  Input: kxtj9 - who_am_i check value and initial data rate fixes
  Input: add driver support for MAX8997-haptic
  Input: tegra-kbc - revise device tree support
  Input: of_keymap - add device tree bindings for simple key matrices
  Input: wacom - fix physical size calculation for 3rd-gen Bamboo
  Input: twl4030-vibra - really switch from #if to #ifdef
  Input: hp680_ts_input - ensure arguments to request_irq and free_irq are compatible
  Input: max8925_onkey - avoid accessing input device too early
  Input: max8925_onkey - allow to be used as a wakeup source
  Input: atmel-wm97xx - convert to dev_pm_ops
  Input: atmel-wm97xx - set driver owner
  Input: add cyttsp touchscreen maintainer entry
  Input: cyttsp - remove useless checks in cyttsp_probe()
  Input: usbtouchscreen - add support for Data Modul EasyTouch TP 72037
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-omap2/board-4430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/devices.c
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
index 3eb00902ca408ea363942c8b8dc21ff515096b3b,8e96f19b62ea994cca874aca4c8f9fee5a467240..2a5cef2f53a79d4c0d305420b2a7e292492464af
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -677,12 -652,19 +677,23 @@@
  #define USB_DEVICE_ID_SYMBOL_SCANNER_1        0x0800
  #define USB_DEVICE_ID_SYMBOL_SCANNER_2        0x1300
  
+ #define USB_VENDOR_ID_SYNAPTICS               0x06cb
+ #define USB_DEVICE_ID_SYNAPTICS_TP    0x0001
+ #define USB_DEVICE_ID_SYNAPTICS_INT_TP        0x0002
+ #define USB_DEVICE_ID_SYNAPTICS_CPAD  0x0003
+ #define USB_DEVICE_ID_SYNAPTICS_TS    0x0006
+ #define USB_DEVICE_ID_SYNAPTICS_STICK 0x0007
+ #define USB_DEVICE_ID_SYNAPTICS_WP    0x0008
+ #define USB_DEVICE_ID_SYNAPTICS_COMP_TP       0x0009
+ #define USB_DEVICE_ID_SYNAPTICS_WTP   0x0010
+ #define USB_DEVICE_ID_SYNAPTICS_DPAD  0x0013
+ 
  #define USB_VENDOR_ID_THRUSTMASTER    0x044f
  
 +#define USB_VENDOR_ID_TIVO            0x150a
 +#define USB_DEVICE_ID_TIVO_SLIDE_BT   0x1200
 +#define USB_DEVICE_ID_TIVO_SLIDE      0x1201
 +
  #define USB_VENDOR_ID_TOPSEED         0x0766
  #define USB_DEVICE_ID_TOPSEED_CYBERLINK       0x0204
  

diff --cc drivers/input/misc/Kconfig
Simple merge

diff --cc kernel/time/timekeeping.c
index 403c2a092830cf91f1225302405f2c8cfd483e8a,e6a5a6bc2769149e8815ff76276256ed073e9e98..15be32e19c6e916dd2b52c29bac9d2b93f9cdef8
--- 1/kernel/time/timekeeping.c
--- 2/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@@ -1254,12 -1225,13 +1254,14 @@@ ktime_t ktime_get_monotonic_offset(void
        struct timespec wtom;
  
        do {
 -              seq = read_seqbegin(&xtime_lock);
 -              wtom = wall_to_monotonic;
 -      } while (read_seqretry(&xtime_lock, seq));
 +              seq = read_seqbegin(&timekeeper.lock);
 +              wtom = timekeeper.wall_to_monotonic;
 +      } while (read_seqretry(&timekeeper.lock, seq));
 +
        return timespec_to_ktime(wtom);
  }
+ EXPORT_SYMBOL_GPL(ktime_get_monotonic_offset);
+ 
  
  /**
   * xtime_update() - advances the timekeeping infrastructure