diff options
| author | Linus Torvalds | 2010-07-06 17:16:09 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2010-07-06 17:16:09 -0700 |
| commit | 47a716cf0ca981b9549ec9815122ada7a0ff707c (patch) | |
| tree | 9b949cce3f111c41478b6bbe404b7fdf525ef45f /include/linux/in6.h | |
| parent | 1cc9629402b1eba0d4e21b2cc43eec9bd737f9bd (diff) | |
| parent | b945d6b2554d550fe95caadc61e521c0ad71fb9c (diff) | |
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 'include/linux/in6.h')
0 files changed, 0 insertions, 0 deletions