Merge branch 'master' into upstream

This commit is contained in:
Jeff Garzik
2006-09-12 12:03:21 -04:00
131 changed files with 988 additions and 790 deletions

View File

@@ -1,5 +1,5 @@
include include/asm-generic/Kbuild.asm
header-y += boot.h cpufeature.h debugreg.h ldt.h setup.h ucontext.h
header-y += boot.h debugreg.h ldt.h setup.h ucontext.h
unifdef-y += mtrr.h vm86.h