Merge branch 'x86/generalize-visws' into x86/core
commit6c82a000a29b93541b5b7db597a083c069755cc9
authorIngo Molnar <mingo@elte.hu>
Fri, 11 Jul 2008 19:22:18 +0000 (11 21:22 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 11 Jul 2008 19:22:18 +0000 (11 21:22 +0200)
treeb9e49724f56b47e4b3d0bd6c6fa3be88dac3a9e6
parent5b4d2386c23e5de553fce002892c7691a989b350
parent39415a440ecceb0a5bd3c23686f18f83bb8368c6
Merge branch 'x86/generalize-visws' into x86/core
arch/x86/kernel/Makefile
arch/x86/kernel/e820.c
arch/x86/kernel/setup.c