Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Jul 2010 00:16:09 +0000 (17:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Jul 2010 00:16:09 +0000 (17:16 -0700)
commit47a716cf0ca981b9549ec9815122ada7a0ff707c
tree9b949cce3f111c41478b6bbe404b7fdf525ef45f
parent1cc9629402b1eba0d4e21b2cc43eec9bd737f9bd
parentb945d6b2554d550fe95caadc61e521c0ad71fb9c
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