diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-23 22:12:53 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-23 22:12:53 (GMT) |
commit | bbf14513ff0e1301a767ed8610babcc34cc132e6 (patch) | |
tree | acd124c2699bb6e1c0d7369913ee66fd999fde61 /kernel/nsproxy.c | |
parent | af6f2b2b5ce478d77a34497f9058bc65093c761a (diff) | |
parent | 629cf6d74beca87d57cea3e38edf7522c397d41e (diff) | |
download | linux-bbf14513ff0e1301a767ed8610babcc34cc132e6.tar.xz |
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: fix 2.6.20 SMP boot regression
ACPICA: fix error path in new external package objects as method arguments
ACPI: gracefully print null trip-point device
Diffstat (limited to 'kernel/nsproxy.c')
0 files changed, 0 insertions, 0 deletions