tree 1db3591bd44c2a20e82f16f84fbc07a714ec36dc
parent 4ae0ff16efeffe7d06726fd3022cdb2f3e9e6892
parent 665d3e2af83c8fbd149534db8f57d82fa6fa6753
author Linus Torvalds <torvalds@linux-foundation.org> 1303235893 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1303235893 -0700

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, gart: Make sure GART does not map physmem above 1TB
  x86, gart: Set DISTLBWALKPRB bit always
  x86, gart: Convert spaces to tabs in enable_gart_translation