Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Sep 2009 15:01:47 +0000 (08:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Sep 2009 15:01:47 +0000 (08:01 -0700)
commit0cc6d77e55eca9557bbe41bf2db94b31aa8fcb2a
tree432df46039500f5220ae315f1efca9431ea257e3
parent55e0715f612f19b44c17497929091df2f3357e5d
parent5051fd69773d2d044734b78516317a04d3774871
Merge branch 'x86-setup-for-linus' of git://git./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
arch/x86/boot/video-vesa.c
arch/x86/kernel/e820.c