leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29b19e2504
linux/drivers/platform/x86
History
Len Brown 29b19e2504 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal 
Conflicts:
	drivers/staging/omap-thermal/omap-thermal-common.
		OMAP supplied dummy TC1 and TC2,
		at the same time that the thermal tree removed them
		from thermal_zone_device_register()

	drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
		propogate the upstream MAX_IDR_LEVEL re-name
			to prevent a build failure

	Previously-fixed-by: Stephen Rothwell <sfr@canb.auug.org.au>

Signed-off-by: Len Brown <len.brown@intel.com>
2012-10-09 01:35:52 -04:00
..
acer-wmi.c drivers-platform-x86: remove useless #ifdef CONFIG_ACPI_VIDEO 2012-09-13 16:46:30 -04:00
acerhdf.c Thermal: Remove tc1/tc2 in generic thermal layer. 2012-09-24 14:44:36 +08:00
amilo-rfkill.c sections: fix section conflicts in drivers/platform/x86 2012-10-06 03:04:43 +09:00
apple-gmux.c drivers-platform-x86: remove useless #ifdef CONFIG_ACPI_VIDEO 2012-09-13 16:46:30 -04:00
asus-laptop.c platform/x86: fix asus_laptop.wled_type description 2012-09-13 16:46:31 -04:00
asus-nb-wmi.c asus-nb-wmi: add some video toggle keys 2012-07-28 00:28:54 -04:00
asus-wmi.c drivers-platform-x86: remove useless #ifdef CONFIG_ACPI_VIDEO 2012-09-13 16:46:30 -04:00
asus-wmi.h asus-wmi: record wlan status while controlled by userapp 2012-08-17 17:34:39 -04:00
classmate-laptop.c classmate-laptop: always call input_sync() after input_report_switch() 2012-08-17 17:34:42 -04:00
compal-laptop.c compal-laptop: switch to using use MODULE_DEVICE_TABLE 2012-03-20 12:02:01 -04:00
dell-laptop.c dell-laptop: Fixed typo in touchpad LED quirk 2012-08-17 17:34:42 -04:00
dell-wmi-aio.c dell: Convert printks to pr_<level> 2011-05-27 12:35:47 -04:00
dell-wmi.c dell-wmi: Add keys for Dell XPS L502X 2011-08-05 15:21:47 -04:00
eeepc-laptop.c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug() 2012-09-13 16:46:31 -04:00
eeepc-wmi.c asus-wmi: control backlight power through WMI, not ACPI 2012-07-28 00:11:49 -04:00
fujitsu-laptop.c Email/web address change 2012-03-28 10:35:15 +02:00
fujitsu-tablet.c sections: fix section conflicts in drivers/platform/x86 2012-10-06 03:04:43 +09:00
hdaps.c platform / x86 / PM: Fix unused function warnings for CONFIG_PM_SLEEP 2012-08-10 14:29:43 +02:00
hp_accel.c platform / x86 / PM: Fix unused function warnings for CONFIG_PM_SLEEP 2012-08-10 14:29:43 +02:00
hp-wmi.c hp-wmi: check for allocation failures 2012-05-31 14:29:33 -04:00
ibm_rtl.c asm-generic: architecture independent readq/writeq for 32bit environment 2012-02-21 16:47:28 -08:00
ideapad-laptop.c ideapad: add Lenovo IdeaPad Z570 support (part 3) 2012-08-20 12:44:41 -04:00
intel_ips.c Power management updates for 3.6 2012-07-22 13:36:52 -07:00
intel_ips.h drm/i915, intel_ips: When i915 loads after IPS, make IPS relink to i915. 2010-12-23 09:51:36 +00:00
intel_menlow.c switch sysfs attr->mode to umode_t 2012-01-03 22:54:55 -05:00
intel_mid_powerbtn.c intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND 2012-05-04 14:40:52 -07:00
intel_mid_thermal.c Thermal: Remove tc1/tc2 in generic thermal layer. 2012-09-24 14:44:36 +08:00
intel_oaktrail.c intel-oaktrail: switch to using use MODULE_DEVICE_TABLE 2012-03-20 12:02:02 -04:00
intel_pmic_gpio.c intel_pmic_gpio: Convert printks to pr_<level> 2011-05-27 12:35:50 -04:00
intel_scu_ipc.c intel_scu_ipc: Remove Moorestown support 2012-03-20 12:02:02 -04:00
intel_scu_ipcutil.c intel_scu_ipc: Remove Moorestown support 2012-03-20 12:02:02 -04:00
Kconfig ideapad: add Lenovo IdeaPad Z570 support (part 2) 2012-08-20 12:44:34 -04:00
Makefile platform/x86: Add driver for Apple gmux device 2012-03-26 15:05:25 -04:00
msi-laptop.c platform / x86 / PM: Fix unused function warnings for CONFIG_PM_SLEEP 2012-08-10 14:29:43 +02:00
msi-wmi.c x86: fix up files really needing to include module.h 2011-10-31 19:30:36 -04:00
mxm-wmi.c mxm/wmi: add MXMX interface entry point. 2011-05-09 11:40:38 +10:00
panasonic-laptop.c platform / x86 / PM: Fix unused function warnings for CONFIG_PM_SLEEP 2012-08-10 14:29:43 +02:00
samsung-laptop.c drivers-platform-x86: remove useless #ifdef CONFIG_ACPI_VIDEO 2012-09-13 16:46:30 -04:00
samsung-q10.c platform-drivers-x86: samsung-q10: make dmi_check_callback return 1 2011-08-05 15:21:47 -04:00
sony-laptop.c platform / x86 / PM: Fix unused function warnings for CONFIG_PM_SLEEP 2012-08-10 14:29:43 +02:00
tc1100-wmi.c tc1100-wmi: Add pr_fmt, use pr_<level> 2011-05-27 12:35:51 -04:00
thinkpad_acpi.c sections: fix section conflicts in drivers/platform/x86 2012-10-06 03:04:43 +09:00
topstar-laptop.c topstar-latop: ignore 0x82 event 2011-10-24 16:52:37 +02:00
toshiba_acpi.c platform / x86 / PM: Fix unused function warnings for CONFIG_PM_SLEEP 2012-08-10 14:29:43 +02:00
toshiba_bluetooth.c platform / x86 / PM: Fix unused function warnings for CONFIG_PM_SLEEP 2012-08-10 14:29:43 +02:00
wmi.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
xo1-rfkill.c drivers: OLPC: update various drivers to include olpc-ec.h 2012-07-31 23:27:29 -04:00
xo15-ebook.c platform / x86 / PM: Fix unused function warnings for CONFIG_PM_SLEEP 2012-08-10 14:29:43 +02:00