From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 14 Sep 2009 15:01:47 +0000 (-0700)
Subject: Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.32-rc1~705
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0cc6d77e55eca9557bbe41bf2db94b31aa8fcb2a;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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
---

0cc6d77e55eca9557bbe41bf2db94b31aa8fcb2a