kevin/linux
1
Fork 0
Code
55b42c5ae9
linux/drivers/hwmon
History
Linus Torvalds 60812a4a99 Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86 
* ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (33 commits)
  x86: convert cpuinfo_x86 array to a per_cpu array
  x86: introduce frame_pointer() and stack_pointer()
  x86 & generic: change to __builtin_prefetch()
  i386: do not BUG_ON() when MSR is unknown
  x86: acpi use cpu_physical_id
  x86: convert cpu_llc_id to be a per cpu variable
  x86: convert cpu_to_apicid to be a per cpu variable
  i386: introduce "used_vectors" bitmap which can be used to reserve vectors.
  x86: use raw locks during oopses
  x86: honor _PAGE_PSE bit on page walks
  i386: do cpuid_device_create() in CPU_UP_PREPARE instead of CPU_ONLINE.
  x86: implement missing x86_64 function smp_call_function_mask()
  x86: use descriptor's functions instead of inline assembly
  i386: consolidate show_regs and show_registers for i386
  i386: make callgraph use dump_trace() on i386/x86_64
  x86: enable iommu_merge by default
  i386: i386 add AMD64 Barcelona PMU MSR definitions to msr.h
  x86: Unify i386 and x86-64 early quirks
  x86: enable HPET on ICH3 and ICH4
  x86: force enable HPET on VT8235/8237 chipsets
  ...

Manually fix trivial conflict with task pid container helper changes in
arch/x86/kernel/process_32.c
2007-10-19 15:06:00 -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 Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07: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 get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -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 x86: convert cpuinfo_x86 array to a per_cpu array 2007-10-19 20:35:04 +02: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 get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
hwmon-vid.c x86: convert cpuinfo_x86 array to a per_cpu array 2007-10-19 20:35:04 +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 Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07: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 Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07: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 Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07:00
w83792d.c Add missing newlines to some uses of dev_<level> messages 2007-10-18 14:37:28 -07:00
w83793.c hwmon: Convert from class_device to device 2007-10-09 22:56:30 -04:00