tree 96ec3ccbab3596dee79ef874483238853351a4f8
parent bb7762961d3ce745688e9050e914c1d3f980268d
parent ee0736627d3347be0be2769fa7b26431f9726c9d
author Linus Torvalds <torvalds@linux-foundation.org> 1244675681 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1244675681 -0700

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

* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, setup: fix comment in the "glove box" code
  x86, setup: "glove box" BIOS interrupts in the video code
  x86, setup: "glove box" BIOS interrupts in the MCA code
  x86, setup: "glove box" BIOS interrupts in the EDD code
  x86, setup: "glove box" BIOS interrupts in the APM code
  x86, setup: "glove box" BIOS interrupts in the core boot code
  x86, setup: "glove box" BIOS calls -- infrastructure