Merge branch 'master' into upstream
[linux-2.6] / arch / i386 / mach-es7000 /
2005-08-25  Len BrownMerge HEAD from ../from-linus
2005-08-24  Len Brown[ACPI] delete CONFIG_ACPI_INTERPRETER
2005-08-24  Len Brown[ACPI] delete CONFIG_ACPI_BOOT
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2