diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 14:51:22 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 14:51:22 -0700 |
commit | 2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6 (patch) | |
tree | e7be2cf442626316b6b6fb212960fe1f77ff2725 /include/net/sock.h | |
parent | be967b7e2f7747a5ebf2a07ee627d9338491e784 (diff) | |
parent | 2f3243aebd8df4d9eecaeca04bbff6c7dbfb2142 (diff) | |
download | linux-3.10-2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6.tar.gz linux-3.10-2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6.tar.bz2 linux-3.10-2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6.zip |
Merge git://git.infradead.org/~dwmw2/rbtree-2.6
* git://git.infradead.org/~dwmw2/rbtree-2.6:
[RBTREE] Switch rb_colour() et al to en_US spelling of 'color' for consistency
Update UML kernel/physmem.c to use rb_parent() accessor macro
[RBTREE] Update hrtimers to use rb_parent() accessor macro.
[RBTREE] Add explicit alignment to sizeof(long) for struct rb_node.
[RBTREE] Merge colour and parent fields of struct rb_node.
[RBTREE] Remove dead code in rb_erase()
[RBTREE] Update JFFS2 to use rb_parent() accessor macro.
[RBTREE] Update eventpoll.c to use rb_parent() accessor macro.
[RBTREE] Update key.c to use rb_parent() accessor macro.
[RBTREE] Update ext3 to use rb_parent() accessor macro.
[RBTREE] Change rbtree off-tree marking in I/O schedulers.
[RBTREE] Add accessor macros for colour and parent fields of rb_node
Diffstat (limited to 'include/net/sock.h')
0 files changed, 0 insertions, 0 deletions