summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-05 17:54:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-05 17:54:18 -0700
commit8110efc64c4790cd1bf7e30f080e5ba3faa7cb85 (patch)
tree708c2a1ef6bebce8eda9676c554bea366547678e /arch/arm/plat-samsung
parent06d8eb1b7d1eb34c76538dab791bc14136ebbc8f (diff)
parentd6cc76856d353a3a9c43bead33210b9216dce332 (diff)
downloadblackbird-obmc-linux-8110efc64c4790cd1bf7e30f080e5ba3faa7cb85.tar.gz
blackbird-obmc-linux-8110efc64c4790cd1bf7e30f080e5ba3faa7cb85.zip
Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
* 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PM / Freezer: Revert 27920651fe "PM / Freezer: Make fake_signal_wake_up() wake TASK_KILLABLE tasks too" PM / Freezer: Reimplement wait_event_freezekillable using freezer_do_not_count/freezer_count USB: Update last_busy time after autosuspend fails PM / Runtime: Automatically retry failed autosuspends PM / QoS: Remove redundant check PM / OPP: Fix build when CONFIG_PM_OPP is not set PM / Runtime: Fix runtime accounting calculation error PM / Sleep: Update freezer documentation PM / Sleep: Remove unused symbol 'suspend_cpu_hotplug' PM / Sleep: Fix race between CPU hotplug and freezer ACPI / PM: Add Sony VPCEB17FX to nonvs blacklist
Diffstat (limited to 'arch/arm/plat-samsung')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud