Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

* 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI: replace acpi_integer by u64
  ACPICA: Update version to 20100121.
  ACPICA: Remove unused uint32_struct type
  ACPICA: Disassembler: Remove obsolete "Integer64" field in parse object
  ACPICA: Remove obsolete ACPI_INTEGER (acpi_integer) type
  ACPICA: Predefined name repair: fix NULL package elements
  ACPICA: AcpiGetDevices: Eliminate unnecessary _STA calls
  ACPICA: Update all ACPICA copyrights and signons to 2010
  ACPICA: Update for new gcc-4 warning options

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

diff --cc drivers/acpi/acpica/acevents.h
Simple merge

diff --cc drivers/acpi/acpica/aclocal.h
Simple merge

diff --cc drivers/acpi/acpica/acobject.h
Simple merge

diff --cc drivers/acpi/acpica/evgpe.c
Simple merge

diff --cc drivers/acpi/acpica/evgpeblk.c
Simple merge

diff --cc drivers/acpi/acpica/evmisc.c
Simple merge

diff --cc drivers/acpi/acpica/evxface.c
Simple merge

diff --cc drivers/acpi/acpica/evxfevnt.c
Simple merge

diff --cc drivers/acpi/ec.c
Simple merge

diff --cc drivers/acpi/processor_idle.c
Simple merge

diff --cc drivers/pci/pci-acpi.c
Simple merge

diff --cc include/acpi/acpi_bus.h
Simple merge

diff --cc include/acpi/acpixf.h
Simple merge

diff --cc include/acpi/actypes.h
Simple merge