kevin/linux
1
Fork 0
Code
d3ec4844d4
linux/drivers/hwmon
History
Linus Torvalds d3ec4844d4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
2011-07-25 13:56:39 -07:00
..
abituguru3.c hwmon: (abituguru) Depend on DMI 2011-05-25 20:43:33 +02:00
abituguru.c hwmon: (abituguru) Depend on DMI 2011-05-25 20:43:33 +02:00
acpi_power_meter.c Move ACPI power meter driver to hwmon 2011-05-25 20:43:32 +02:00
ad7414.c
ad7418.c
adcxx.c hwmon: Use helper functions to set and get driver data 2011-05-25 20:43:31 +02:00
adm1021.c
adm1025.c
adm1026.c Fix common misspellings 2011-03-31 11:26:23 -03:00
adm1029.c
adm1031.c
adm1275.c hwmon: (adm1275) Fix coefficients per datasheet revision B 2011-07-15 08:09:40 -07:00
adm9240.c
ads1015.c hwmon: (ads1015) Make gain and datarate configurable 2011-03-21 17:59:37 +01:00
ads7828.c
ads7871.c
adt7411.c hwmon: (adt7411) add MODULE_DEVICE_TABLE 2011-02-26 08:59:32 -08:00
adt7462.c
adt7470.c
adt7475.c
amc6821.c
applesmc.c
asb100.c
asc7621.c
asus_atk0110.c hwmon: (asus_atk0110) Fix memory leak 2011-07-17 18:39:18 +02:00
atxp1.c
coretemp.c hwmon: (coretemp) Drop unused struct members 2011-06-17 23:22:26 -07:00
dme1737.c
ds620.c
ds1621.c
emc6w201.c hwmon: (emc6w201) Properly handle all errors 2011-07-03 13:32:53 +02:00
emc1403.c
emc2103.c
f71805f.c
f71882fg.c hwmon: (f71882fg) Add support for the F71869A 2011-07-03 13:32:53 +02:00
f75375s.c
fam15h_power.c hwmon: Add driver for AMD family 15h processor power information 2011-05-25 20:43:31 +02:00
fschmd.c
g760a.c
gl518sm.c
gl520sm.c treewide: fix potentially dangerous trailing ';' in #defined values/expressions 2011-07-21 14:10:00 +02:00
gpio-fan.c drivers: Final irq namespace conversion 2011-03-29 14:48:19 +02:00
hwmon-vid.c hwmon-vid: Fix typo in VIA CPU name 2011-07-03 13:32:54 +02:00
hwmon.c
i5k_amb.c
ibmaem.c hwmon: (ibmaem) Initialize sysfs attributes 2011-06-17 23:22:26 -07:00
ibmpex.c hwmon: (ibmpex) Initialize sysfs attributes 2011-06-17 23:22:27 -07:00
it87.c hwmon: (it87) Fix label group removal 2011-07-17 18:39:19 +02:00
jc42.c hwmon: (jc42) Change detection class 2011-05-25 20:43:32 +02:00
jz4740-hwmon.c jz4740: silence warnings related to mfd_get_cell changes 2011-03-23 10:42:02 +01:00
k8temp.c hwmon: Use helper functions to set and get driver data 2011-05-25 20:43:31 +02:00
k10temp.c hwmon: (k10temp) Add support for Fam15h (Bulldozer) 2011-05-25 20:43:31 +02:00
Kconfig hwmon: (f71882fg) Add support for the F71869A 2011-07-03 13:32:53 +02:00
lineage-pem.c hwmon: (lineage-pem): Fix in1 voltage alarm sysfs attributes 2011-03-16 06:57:34 -07:00
lm63.c
lm70.c hwmon: Use helper functions to set and get driver data 2011-05-25 20:43:31 +02:00
lm73.c
lm75.c hwmon: (lm75) Speed up detection 2011-03-21 17:59:36 +01:00
lm75.h
lm77.c
lm78.c
lm80.c
lm83.c
lm85.c hwmon: (lm85) Fix error paths in probe function 2011-04-29 16:33:36 +02:00
lm87.c
lm90.c hwmon: (lm90) Add support for ADT7461A and NCT1008 2011-04-29 16:33:35 +02:00
lm92.c
lm93.c
lm95241.c hwmon: (lm95241) Fix negative temperature results 2011-07-10 08:54:15 -07:00
ltc4151.c hwmon: Add support for LTC4151 2011-03-14 22:39:11 -07:00
ltc4215.c
ltc4245.c
ltc4261.c
Makefile hwmon: New driver for the SMSC EMC6W201 2011-05-25 20:43:33 +02:00
max1111.c hwmon: (max1111) Fix race condition causing NULL pointer exception 2011-07-17 18:39:19 +02:00
max1619.c
max6639.c hwmon: (max6639) Set reasonable default PWM frequency 2011-03-14 22:36:25 -07:00
max6642.c hwmon: (max6642): Better chip detection schema 2011-06-04 10:34:28 -07:00
max6650.c hwmon: (max6650) Properly support the MAX6650 2011-05-25 20:43:32 +02:00
max8688.c hwmon: (pmbus) Expand scope of device specific get_status function 2011-05-19 08:19:38 -07:00
max16064.c hwmon: (pmbus) Add support for Maxim MAX16064 2011-03-14 22:39:07 -07:00
max16065.c hwmon: Driver for MAX16065 System Manager and compatibles 2011-05-19 08:19:36 -07:00
max34440.c hwmon: (pmbus) Expand scope of device specific get_status function 2011-05-19 08:19:38 -07:00
mc13783-adc.c
pc87360.c
pc87427.c
pcf8591.c
pmbus_core.c hwmon: (pmbus) Use long variables for register to data conversions 2011-07-12 06:45:45 -07:00
pmbus.c hwmon: (pmbus) Improve auto-detection of temperature status register 2011-07-10 08:54:29 -07:00
pmbus.h hwmon: (pmbus) Expand scope of device specific get_status function 2011-05-19 08:19:38 -07:00
s3c-hwmon.c hwmon: (s3c) Initialize sysfs attributes 2011-06-17 23:22:27 -07:00
sch5627.c hwmon: Use <> rather than () around my e-mail address 2011-07-03 13:32:53 +02:00
sht15.c hwmon: (sht15) add support for CRC validation 2011-05-19 08:19:36 -07:00
sht21.c
sis5595.c
smm665.c
smsc47b397.c
smsc47m1.c
smsc47m192.c
thmc50.c
tmp102.c Fix common misspellings 2011-03-31 11:26:23 -03:00
tmp401.c
tmp421.c
twl4030-madc-hwmon.c hwmon: (twl4030-madc-hwmon) Return proper error if hwmon_device_register fails 2011-05-01 09:06:35 -07:00
ucd9000.c hwmon: (pmbus) Support for TI UCD90xxx series Sequencer and System Health Controllers 2011-05-19 08:19:40 -07:00
ucd9200.c hwmon: (pmbus) Add support for TI UCD9200 series of PWM System Controllers 2011-05-19 08:19:39 -07:00
ultra45_env.c hwmon: Use helper functions to set and get driver data 2011-05-25 20:43:31 +02:00
via686a.c
via-cputemp.c
vt1211.c
vt8231.c
w83l785ts.c
w83l786ng.c
w83627ehf.c hwmon: (w83627ehf) Display correct temperature sensor labels for systems with NCT6775F 2011-03-14 22:39:20 -07:00
w83627hf.c
w83781d.c
w83791d.c Fix common misspellings 2011-03-31 11:26:23 -03:00
w83792d.c Fix common misspellings 2011-03-31 11:26:23 -03:00
w83793.c Fix common misspellings 2011-03-31 11:26:23 -03:00
w83795.c
wm831x-hwmon.c
wm8350-hwmon.c