| commit | 0cc6d77e55eca9557bbe41bf2db94b31aa8fcb2a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 14 08:01:47 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 14 08:01:47 2009 -0700 |
| tree | 432df46039500f5220ae315f1efca9431ea257e3 | |
| parent | 55e0715f612f19b44c17497929091df2f3357e5d [diff] | |
| parent | 5051fd69773d2d044734b78516317a04d3774871 [diff] |
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