tree 432df46039500f5220ae315f1efca9431ea257e3
parent 55e0715f612f19b44c17497929091df2f3357e5d
parent 5051fd69773d2d044734b78516317a04d3774871
author Linus Torvalds <torvalds@linux-foundation.org> 1252940507 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1252940507 -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, e820: Guard against array overflowed in __e820_add_region()
  x86, setup: remove obsolete pre-Kconfig CONFIG_VIDEO_ variables