commit c4fd308ed62f292518363ea9c6c2adb3c2d95f9d
author Linus Torvalds <torvalds@linux-foundation.org> Tue May 18 09:28:04 2010 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue May 18 09:28:04 2010 -0700
tree d6b4e36159e502a43a91ade86379703442204fc5
parent 96fbeb973a7e17594a429537201611ca0b395622
parent 1f9cc3cb6a27521edfe0a21abf97d2bb11c4d237

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

* 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, pat: Update the page flags for memtype atomically instead of using memtype_lock
  x86, pat: In rbt_memtype_check_insert(), update new->type only if valid
  x86, pat: Migrate to rbtree only backend for pat memtype management
  x86, pat: Preparatory changes in pat.c for bigger rbtree change
  rbtree: Add support for augmented rbtrees