kevin/linux
1
Fork 0
Code
90fd5ce5f6
linux/drivers/hwmon
History
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 Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 2007-10-12 21:27:47 -04:00
abituguru3.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
abituguru.c Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 2007-10-14 12:50:19 -07:00
ad7418.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
adm1021.c hwmon: (adm1021) individual alarm files 2007-10-09 22:56:31 -04:00
adm1025.c hwmon: VRM is not read from registers 2007-10-09 22:56:32 -04:00
adm1026.c hwmon: VRM is not read from registers 2007-10-09 22:56:32 -04:00
adm1029.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
adm1031.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
adm9240.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
adt7470.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
applesmc.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2007-10-15 13:41:39 -07:00
asb100.c hwmon: VRM is not read from registers 2007-10-09 22:56:32 -04:00
atxp1.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
coretemp.c hwmon: (coretemp) Add support for Celeron 4xx 2007-10-09 22:56:32 -04:00
dme1737.c hwmon: (dme1737) Add sch311x support 2007-10-10 22:47:13 -04:00
ds1621.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
f71805f.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
f71882fg.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
f75375s.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
fscher.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
fschmd.c hwmon: Add new combined driver for FSC chips 2007-10-11 08:11:24 -04:00
fscpos.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
gl518sm.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
gl520sm.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
hdaps.c HWMON: hdaps - switch to using input-polldev 2007-10-12 21:30:36 -04:00
hwmon-vid.c hwmon-vid: Don't spam the logs when VRM version is missing 2007-05-27 22:17:43 +02:00
hwmon.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
ibmpex.c hwmon: (ibmpex) Release IPMI user if hwmon registration fails 2007-10-11 07:42:00 -04:00
it87.c hwmon: VRM is not read from registers 2007-10-09 22:56:32 -04:00
k8temp.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
Kconfig Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2007-10-15 13:41:39 -07:00
lm63.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
lm70.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
lm75.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
lm75.h hwmon: Allow writing of negative trigger temperatures 2007-10-09 22:56:29 -04:00
lm77.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
lm78.c hwmon: (lm78) Add individual alarm files 2007-10-09 22:56:31 -04:00
lm80.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
lm83.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
lm85.c hwmon: VRM is not read from registers 2007-10-09 22:56:32 -04:00
lm87.c hwmon: (lm87) Disable VID when it should be 2007-10-09 22:56:32 -04:00
lm90.c hwmon: (lm90) Export temperature offset values 2007-10-09 22:56:31 -04:00
lm92.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
lm93.c hwmon: (lm93) Use standard names for vid files 2007-10-09 22:56:30 -04:00
Makefile hwmon: Add new combined driver for FSC chips 2007-10-11 08:11:24 -04:00
max1619.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
max6650.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
pc87360.c hwmon: VRM is not read from registers 2007-10-09 22:56:32 -04:00
pc87427.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
sis5595.c hwmon: (sis5595) fix sparse warning 2007-10-14 14:57:35 -04:00
smsc47b397.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
smsc47m1.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
smsc47m192.c hwmon: VRM is not read from registers 2007-10-09 22:56:32 -04:00
thmc50.c hwmon: (thmc50) Fix a debug message 2007-10-09 22:56:31 -04:00
via686a.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
vt1211.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
vt8231.c hwmon: (vt8231) fix sparse warning 2007-10-14 15:00:24 -04:00
w83l785ts.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
w83627ehf.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
w83627hf.c hwmon: (w83627hf) don't assume bank 0 2007-10-13 20:37:19 -04:00
w83781d.c hwmon: (w83781d) Add individual alarm and beep files 2007-10-09 22:56:32 -04:00
w83791d.c hwmon: VRM is not read from registers 2007-10-09 22:56:32 -04:00
w83792d.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00
w83793.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00