diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-27 08:03:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-27 08:03:22 -0700 |
commit | c94b4321ebde51a80a805f7a5e102ac083ae2ac9 (patch) | |
tree | ac6e0f251436d7e800ba12e783126a6d572b4623 /include/linux/timex.h | |
parent | f6d107fb10def502522b10bfb7af9533afbb8274 (diff) | |
parent | 1192aeb957402b45f311895f124e4ca41206843c (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: drivers/acpi: elide a non-zero test on a result that is never 0
pnpacpi: reduce printk severity for "pnpacpi: exceeded the max number of ..."
cpuidle: fix 100% C0 statistics regression
cpuidle: fix cpuidle time and usage overflow
ACPI: fix mis-merge -- invoke acpi_unlazy_tlb() only on C3 entry
ACPI: fix a regression of ACPI device driver autoloading
ACPI: SBS: remove typo from sbchc.c
Diffstat (limited to 'include/linux/timex.h')
0 files changed, 0 insertions, 0 deletions