Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Apr 2011 17:58:13 +0000 (10:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 19 Apr 2011 17:58:13 +0000 (10:58 -0700)
commit9d914b3ef38d996aa6b369267fd2975e7efa92d6
tree1db3591bd44c2a20e82f16f84fbc07a714ec36dc
parent4ae0ff16efeffe7d06726fd3022cdb2f3e9e6892
parent665d3e2af83c8fbd149534db8f57d82fa6fa6753
Merge branch 'x86-fixes-for-linus' of git://git./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