tree 9b949cce3f111c41478b6bbe404b7fdf525ef45f
parent 1cc9629402b1eba0d4e21b2cc43eec9bd737f9bd
parent b945d6b2554d550fe95caadc61e521c0ad71fb9c
author Linus Torvalds <torvalds@linux-foundation.org> 1278461769 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1278461769 -0700

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/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