git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55e0715 5051fd6)
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)
* '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

1  2 
arch/x86/boot/video-vesa.c patch | diff1 | diff2 | blob | history
arch/x86/kernel/e820.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/boot/video-vesa.c
Simple merge
diff --cc arch/x86/kernel/e820.c
Simple merge
Pandora Kernel Repository