summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-17 00:18:17 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-17 00:18:17 +0100
commit1e8703b2e6aefba84dd9633d90a4093ff1200b93 (patch)
tree648c6a9ebd0ecfae1d5ef9c44e9996300b7232cd /drivers/ata
parentMerge branch 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff)
parentPM / PM QoS: Fix reversed min and max (diff)
downloadlinux-1e8703b2e6aefba84dd9633d90a4093ff1200b93.tar.xz
linux-1e8703b2e6aefba84dd9633d90a4093ff1200b93.zip
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM / PM QoS: Fix reversed min and max PM / OPP: Hide OPP configuration when SoCs do not provide an implementation PM: Allow devices to be removed during late suspend and early resume
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions