leandrof/linux
1
0
Fork 0
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-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
dell-laptop.c dell-laptop: Fixed typo in touchpad LED quirk 2012-08-17 17:34:42 -04:00
dell-wmi-aio.c
dell-wmi.c
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
fujitsu-laptop.c
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
ibm_rtl.c
ideapad-laptop.c ideapad: add Lenovo IdeaPad Z570 support (part 3) 2012-08-20 12:44:41 -04:00
intel_ips.c
intel_ips.h
intel_menlow.c
intel_mid_powerbtn.c
intel_mid_thermal.c Thermal: Remove tc1/tc2 in generic thermal layer. 2012-09-24 14:44:36 +08:00
intel_oaktrail.c
intel_pmic_gpio.c
intel_scu_ipc.c
intel_scu_ipcutil.c
Kconfig ideapad: add Lenovo IdeaPad Z570 support (part 2) 2012-08-20 12:44:34 -04:00
Makefile
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
mxm-wmi.c
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
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
thinkpad_acpi.c sections: fix section conflicts in drivers/platform/x86 2012-10-06 03:04:43 +09:00
topstar-laptop.c
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
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