summaryrefslogtreecommitdiffstats
path: root/fs/ext3
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-10-04 15:03:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-10-04 15:03:42 -0700
commit7dee8dff47734ee52da2cd8b8ea9736e42c5062f (patch)
tree746b261cc55e59909f225f0575c50f1a74dfcccd /fs/ext3
parent3dbecf0aa9692cffbb71313a380c0ecc606c5920 (diff)
parent726dcbe5f5d88080b9106f3a55b95d358b2aa140 (diff)
downloadlinux-7dee8dff47734ee52da2cd8b8ea9736e42c5062f.tar.gz
linux-7dee8dff47734ee52da2cd8b8ea9736e42c5062f.tar.bz2
linux-7dee8dff47734ee52da2cd8b8ea9736e42c5062f.zip
Merge tag 'pm+acpi-3.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI and power management fixes from Rafael Wysocki: - The resume part of user space driven hibernation (s2disk) is now broken after the change that moved the creation of memory bitmaps to after the freezing of tasks, because I forgot that the resume utility loaded the image before freezing tasks and needed the bitmaps for that. The fix adds special handling for that case. - One of recent commits changed the export of acpi_bus_get_device() to EXPORT_SYMBOL_GPL(), which was technically correct but broke existing binary modules using that function including one in particularly widespread use. Change it back to EXPORT_SYMBOL(). - The intel_pstate driver sometimes fails to disable turbo if its no_turbo sysfs attribute is set. Fix from Srinivas Pandruvada. - One of recent cpufreq fixes forgot to update a check in cpufreq-cpu0 which still (incorrectly) treats non-NULL as non-error. Fix from Philipp Zabel. - The SPEAr cpufreq driver uses a wrong variable type in one place preventing it from catching errors returned by one of the functions called by it. Fix from Sachin Kamat. * tag 'pm+acpi-3.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI: Use EXPORT_SYMBOL() for acpi_bus_get_device() intel_pstate: fix no_turbo cpufreq: cpufreq-cpu0: NULL is a valid regulator, part 2 cpufreq: SPEAr: Fix incorrect variable type PM / hibernate: Fix user space driven resume regression
Diffstat (limited to 'fs/ext3')
0 files changed, 0 insertions, 0 deletions