diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 16:50:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 16:50:06 -0400 |
| commit | cc150a2861e744d8f574d571762cc7e9f928abb3 (patch) | |
| tree | a1567d76fc52dc56ba483d7dafa82fada5fc28ba /Documentation/feature-removal-schedule.txt | |
| parent | d9a807461fc8cc0d6ba589ea0730d139122af012 (diff) | |
| parent | 592758b12f2e327bb5902dabd3d36b2e86049871 (diff) | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
"New drivers for: MCP3221, ADT7410, MAX197
Chip support added to existing drivers: LM71, LM74, MAX1110, MAX1112,
MAX1113, INA220, INA230, MCP3221
Cleanup: Use devm_ functions, fixed build warnings, removed deprecated
sysfs attributes, code simplifications, dropped dependencies on
EXPERIMENTAL"
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (64 commits)
hwmon: (mcp3021) Add MCP3221 support
hwmon: (mcp3021) Prepare MCP3021 driver to support other chips
hwmon: (w83791d) Drop unnecessary compare statements
hwmon: (lm93) Drop unnecessary compare statement
hwmon: (lm70) Simplify show_name function
hwmon: (adcxx) Simplify show_name function
hwmon: Drop dependencies on EXPERIMENTAL
hwmon: (it87) Fix Kconfig for IT87 driver
hwmon: (sht15) move header to linux/platform_data/
hwmon: (asus_atk0110) Remove useless kfree
hwmon: (ina2xx) Add support for INA220 and INA230
hwmon: (ina2xx) Use structure array to distinguish chip types
hwmon: (max1111) Add support for MAX1110, MAX1112, and MAX1113
hwmon: (lm70) Add support for LM71 and LM74
hwmon: (Documentation) Update feature-removal-schedule.txt
hwmon: (w83793) Remove legacy chassis intrusion detection sysfs attributes
hwmon: (w83792d) Remove legacy chassis intrusion detection attributes
hwmon: (adm9240) Remove legacy chassis intrusion detection sysfs attribute
hwmon: (lm70) Allow 4wire SPI bus with LM70
hwmon: (sht15) remove multiple driver registration
...
Diffstat (limited to 'Documentation/feature-removal-schedule.txt')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 43975ba1fde1..72bab3fe428f 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -357,16 +357,6 @@ Who: Wey-Yi Guy <wey-yi.w.guy@intel.com> | |||
| 357 | 357 | ||
| 358 | ---------------------------- | 358 | ---------------------------- |
| 359 | 359 | ||
| 360 | What: Legacy, non-standard chassis intrusion detection interface. | ||
| 361 | When: June 2011 | ||
| 362 | Why: The adm9240, w83792d and w83793 hardware monitoring drivers have | ||
| 363 | legacy interfaces for chassis intrusion detection. A standard | ||
| 364 | interface has been added to each driver, so the legacy interface | ||
| 365 | can be removed. | ||
| 366 | Who: Jean Delvare <khali@linux-fr.org> | ||
| 367 | |||
| 368 | ---------------------------- | ||
| 369 | |||
| 370 | What: i2c_driver.attach_adapter | 360 | What: i2c_driver.attach_adapter |
| 371 | i2c_driver.detach_adapter | 361 | i2c_driver.detach_adapter |
| 372 | When: September 2011 | 362 | When: September 2011 |