diff options
author | 2010-07-06 17:16:09 -0700 | |
---|---|---|
committer | 2010-07-06 17:16:09 -0700 | |
commit | 47a716cf0ca981b9549ec9815122ada7a0ff707c (patch) | |
tree | 9b949cce3f111c41478b6bbe404b7fdf525ef45f /kernel/sysctl.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client (diff) | |
parent | rbtree: Undo augmented trees performance damage and regression (diff) | |
download | linux-dev-47a716cf0ca981b9549ec9815122ada7a0ff707c.tar.xz linux-dev-47a716cf0ca981b9549ec9815122ada7a0ff707c.zip |
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
Diffstat (limited to 'kernel/sysctl.c')
0 files changed, 0 insertions, 0 deletions