From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 15 Oct 2007 20:41:39 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: v2.6.24-rc1~1279
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=f2e1d89f9b349b3cd914b7c6ec6368632f4ad048

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (40 commits)
  Input: use full RCU API
  Input: remove tsdev interface
  Input: add support for Blackfin BF54x Keypad controller
  Input: appletouch - another fix for idle reset logic
  HWMON: hdaps - switch to using input-polldev
  Input: add support for SEGA Dreamcast keyboard
  Input: omap-keyboard - don't pretend we support changing keymap
  Input: lifebook - fix X and Y axis range
  Input: usbtouchscreen - add support for GeneralTouch devices
  Input: fix open count handling in input interfaces
  Input: keyboard - add CapsShift lock
  Input: adbhid - produce all CapsLock key events
  Input: ALPS - add signature for ThinkPad R61
  Input: jornada720_kbd - send MSC_SCAN events
  Input: add support for the HP Jornada 7xx (710/720/728) touchscreen
  Input: add support for HP Jornada 7xx onboard keyboard
  Input: add support for HP Jornada onboard keyboard (HP6XX)
  Input: ucb1400_ts - use schedule_timeout_uninterruptible
  Input: xpad - fix dependancy on LEDS class
  Input: auto-select INPUT for MAC_EMUMOUSEBTN option
  ...

Resolved conflicts manually in drivers/hwmon/applesmc.c: converting from
a class device to a device and converting to use input-polldev created a
few apparently trivial clashes..
---

f2e1d89f9b349b3cd914b7c6ec6368632f4ad048
diff --cc drivers/hwmon/applesmc.c
index f37fd7ebf65a,571f49e80277..4879125b4cdc
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@@ -125,9 -125,8 +125,8 @@@ static const int debug
  static struct platform_device *pdev;
  static s16 rest_x;
  static s16 rest_y;
- static struct timer_list applesmc_timer;
- static struct input_dev *applesmc_idev;
 +static struct device *hwmon_dev;
+ static struct input_polled_dev *applesmc_idev;
 -static struct class_device *hwmon_class_dev;
  
  /* Indicates whether this computer has an accelerometer. */
  static unsigned int applesmc_accelerometer;