tree 528f9f1f3f8cf0ce933a366f137faaf55ab89079
parent a10d9a71bafd3a283da240d2868e71346d2aef6f
parent 3fbc54165d7217abf62b871c0dd074e76ce0eb31
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1184785982 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1184785982 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
  [PATCH] x86: do not recompile boot for each build
  [x86 setup] Save/restore DS around invocations of INT 10h
  [x86 setup] VGA: Clear the Protect bit before setting the vertical height
  [x86 setup] Fix assembly constraints
  [x86 setup] build/tools.c: fix comment
  [x86 setup] MAINTAINERS: document x86 setup code git tree