diff options
author | Len Brown <len.brown@intel.com> | 2007-11-20 07:20:00 +0100 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-11-20 07:20:00 +0100 |
commit | c2e46d2e2a8e6ed17fac6154ac7e5fa7fe4efb28 (patch) | |
tree | 39e4aa997e6a10ef4eebb31487ea15c3c2e70c34 /arch/x86/kernel/acpi | |
parent | Pull cpuidle into release branch (diff) | |
parent | Revert "acpi: make ACPI_PROCFS default to y" (diff) | |
download | linux-c2e46d2e2a8e6ed17fac6154ac7e5fa7fe4efb28.tar.xz linux-c2e46d2e2a8e6ed17fac6154ac7e5fa7fe4efb28.zip |
Pull procfs-default into release branch
Conflicts:
drivers/acpi/sbs.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/x86/kernel/acpi')
0 files changed, 0 insertions, 0 deletions