android_kernel_samsung_msm8976/drivers/hwmon
Linus Torvalds f2e1d89f9b 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: (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..
2007-10-15 13:41:39 -07:00
..
ams
abituguru.c
abituguru3.c
ad7418.c
adm1021.c
adm1025.c
adm1026.c
adm1029.c
adm1031.c
adm9240.c
adt7470.c
applesmc.c
asb100.c
atxp1.c
coretemp.c
dme1737.c
ds1621.c
f71805f.c
f71882fg.c
f75375s.c
fscher.c
fschmd.c
fscpos.c
gl518sm.c
gl520sm.c
hdaps.c
hwmon-vid.c
hwmon.c
ibmpex.c
it87.c
k8temp.c
Kconfig
lm63.c
lm70.c
lm75.c
lm75.h
lm77.c
lm78.c
lm80.c
lm83.c
lm85.c
lm87.c
lm90.c
lm92.c
lm93.c
Makefile
max1619.c
max6650.c
pc87360.c
pc87427.c
sis5595.c
smsc47b397.c
smsc47m1.c
smsc47m192.c
thmc50.c
via686a.c
vt1211.c
vt8231.c
w83l785ts.c
w83627ehf.c
w83627hf.c
w83781d.c
w83791d.c
w83792d.c
w83793.c