diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 11:01:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-14 11:01:47 -0400 |
| commit | 0cc6d77e55eca9557bbe41bf2db94b31aa8fcb2a (patch) | |
| tree | 432df46039500f5220ae315f1efca9431ea257e3 /net | |
| 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
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions