From: Linus Torvalds Date: Tue, 18 May 2010 16:28:04 +0000 (-0700) Subject: Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v2.6.35-rc1~508 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=c4fd308ed62f292518363ea9c6c2adb3c2d95f9d Merge branch 'x86-pat-for-linus' of git://git./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 --- c4fd308ed62f292518363ea9c6c2adb3c2d95f9d