diff options
author | Len Brown <len.brown@intel.com> | 2007-02-03 01:39:07 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-02-03 01:39:07 -0500 |
commit | 6b259707d53f0f25f0b24318a0774f1ae7e7e92c (patch) | |
tree | 9f05353c2134d57607ee9780e3a35e56952ea2e8 /kernel | |
parent | Pull asus into test branch (diff) | |
parent | ACPI: prevent build failure when CONFIG_X86_NUMAQ=y (diff) | |
download | linux-dev-6b259707d53f0f25f0b24318a0774f1ae7e7e92c.tar.xz linux-dev-6b259707d53f0f25f0b24318a0774f1ae7e7e92c.zip |
Pull trivial into test branch
Conflicts:
drivers/acpi/scan.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions