]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 7 Dec 2009 12:14:12 +0000 (13:14 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 7 Dec 2009 12:14:18 +0000 (13:14 +0100)
commit42debad85f71a8c5b84bf6e7b0358a7be9884471
tree885b5e0b5bb3d87efc4bfbde69feff2ece32ecac
parentb76f3ad98f0312149fd2d05d379dbb16390b09c0
parent74e23fcca9637aa0b7e6572430d70b74cce55262
Merge branch 'linus' into x86/urgent

Merge reason: we want to queue up a dependent fix.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/Kconfig
arch/x86/Makefile_32.cpu
arch/x86/kernel/cpu/intel_cacheinfo.c
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/reboot.c
arch/x86/mm/kmmio.c