tree 22a16cea2838fd473d03e8c6c64b93f0e3519f33
parent 781c5a67f152c17c3e4a9ed9647f8c0be6ea5ae9
parent 40ffa93791985ab300fd488072e9f37ccf72e88c
author Linus Torvalds <torvalds@linux-foundation.org> 1287692286 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1287692286 -0700

Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Remove stale pmtimer_64.c
  x86, cleanups: Use clear_page/copy_page rather than memset/memcpy
  x86: Remove unnecessary #ifdef ACPI/X86_IO_ACPI
  x86, cleanup: Remove obsolete boot_cpu_id variable