summaryrefslogtreecommitdiffstats
path: root/include/asm-v850/shmparam.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-20 23:51:22 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-20 23:51:22 +0200
commit2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6 (patch)
treee7be2cf442626316b6b6fb212960fe1f77ff2725 /include/asm-v850/shmparam.h
parentMerge git://git.infradead.org/mtd-2.6 (diff)
parent[RBTREE] Switch rb_colour() et al to en_US spelling of 'color' for consistency (diff)
downloadlinux-2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6.tar.xz
linux-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 '')
0 files changed, 0 insertions, 0 deletions