diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 22:27:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-12 22:27:59 -0400 |
| commit | a3920a6efa158b445b8a39080b463b9b29337425 (patch) | |
| tree | 1726a21d317bea8039c1f0f041b7443af76f6ca1 /drivers/hwmon/Makefile | |
| parent | 18a022de47bc11ee20d7d0f4dd72d42d2cfdc51c (diff) | |
| parent | d1d4a81b842db21b144ffd2334ca5eee3eb740f3 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull ACPI & Thermal updates from Len Brown:
"The generic Linux thermal layer is gaining some new capabilities
(generic cooling via cpufreq) and some new customers (ARM).
Also, an ACPI EC bug fix plus a regression fix."
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (30 commits)
tools/power/acpi/acpidump: remove duplicated include from acpidump.c
ACPI idle, CPU hotplug: Fix NULL pointer dereference during hotplug
cpuidle / ACPI: fix potential NULL pointer dereference
ACPI: EC: Add a quirk for CLEVO M720T/M730T laptop
ACPI: EC: Make the GPE storm threshold a module parameter
thermal: Exynos: Fix NULL pointer dereference in exynos_unregister_thermal()
Thermal: Fix bug on cpu_cooling, cooling device's id conflict problem.
thermal: exynos: Use devm_* functions
ARM: exynos: add thermal sensor driver platform data support
thermal: exynos: register the tmu sensor with the kernel thermal layer
thermal: exynos5: add exynos5250 thermal sensor driver support
hwmon: exynos4: move thermal sensor driver to driver/thermal directory
thermal: add generic cpufreq cooling implementation
Fix a build error.
thermal: Fix potential NULL pointer accesses
thermal: add Renesas R-Car thermal sensor support
thermal: fix potential out-of-bounds memory access
Thermal: Introduce locking for cdev.thermal_instances list.
Thermal: Unify the code for both active and passive cooling
Thermal: Introduce simple arbitrator for setting device cooling state
...
Diffstat (limited to 'drivers/hwmon/Makefile')
| -rw-r--r-- | drivers/hwmon/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index a62ce17ddbfc..8d5fcb5e8e9f 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile | |||
| @@ -50,7 +50,6 @@ obj-$(CONFIG_SENSORS_DS1621) += ds1621.o | |||
| 50 | obj-$(CONFIG_SENSORS_EMC1403) += emc1403.o | 50 | obj-$(CONFIG_SENSORS_EMC1403) += emc1403.o |
| 51 | obj-$(CONFIG_SENSORS_EMC2103) += emc2103.o | 51 | obj-$(CONFIG_SENSORS_EMC2103) += emc2103.o |
| 52 | obj-$(CONFIG_SENSORS_EMC6W201) += emc6w201.o | 52 | obj-$(CONFIG_SENSORS_EMC6W201) += emc6w201.o |
| 53 | obj-$(CONFIG_SENSORS_EXYNOS4_TMU) += exynos4_tmu.o | ||
| 54 | obj-$(CONFIG_SENSORS_F71805F) += f71805f.o | 53 | obj-$(CONFIG_SENSORS_F71805F) += f71805f.o |
| 55 | obj-$(CONFIG_SENSORS_F71882FG) += f71882fg.o | 54 | obj-$(CONFIG_SENSORS_F71882FG) += f71882fg.o |
| 56 | obj-$(CONFIG_SENSORS_F75375S) += f75375s.o | 55 | obj-$(CONFIG_SENSORS_F75375S) += f75375s.o |