summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/sleep
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 21:07:03 +0200
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 21:07:03 +0200
commitec2626815bf9a9922e49820b03e670e833f3ca3c (patch)
treec1d6ff9559a62c5636adaae7a6c7cac397762f42 /drivers/acpi/sleep
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
parentsched: fix guest time accounting going faster than user time accounting (diff)
downloadlinux-ec2626815bf9a9922e49820b03e670e833f3ca3c.tar.xz
linux-ec2626815bf9a9922e49820b03e670e833f3ca3c.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: sched: fix guest time accounting going faster than user time accounting
Diffstat (limited to 'drivers/acpi/sleep')
0 files changed, 0 insertions, 0 deletions