Merge branch 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Feb 2010 18:39:16 +0000 (10:39 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Feb 2010 18:39:16 +0000 (10:39 -0800)
commit0091945b4732469bb39bbb4556ce08a25d89d1c2
treebb6c4fc80995d35f1b4b7088a0f9e92d8f679c4f
parent46bbffad54bd48bb809f2691c1970a79a588976b
parent40d6753e78a602bdf62e7741c0caa36474882f00
Merge branch 'x86-mtrr-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-mtrr-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Convert set_atomicity_lock to raw_spinlock
  x86, mtrr: Kill over the top warn
  x86, mtrr: Constify struct mtrr_ops