From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Jul 2010 00:16:09 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.0~4279
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47a716cf0ca981b9549ec9815122ada7a0ff707c;p=platform%2Fkernel%2Flinux-amlogic.git

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:
  rbtree: Undo augmented trees performance damage and regression
  x86, Calgary: Limit the max PHB number to 256
---

47a716cf0ca981b9549ec9815122ada7a0ff707c