Merge branch 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...

* 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  drivers/firmware: const-ify DMI API and internals

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge

diff --cc arch/x86/kernel/acpi/sleep_32.c
Simple merge

diff --cc arch/x86/kernel/apm_32.c
Simple merge

diff --cc arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
Simple merge

diff --cc arch/x86/kernel/reboot_32.c
Simple merge

diff --cc arch/x86/kernel/tsc_32.c
Simple merge

diff --cc arch/x86/mach-generic/bigsmp.c
Simple merge

diff --cc arch/x86/pci/common.c
Simple merge

diff --cc arch/x86/pci/irq.c
Simple merge