Linus Torvalds 2edc322d42 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		2006-06-20 14:51:22 -07:00
..
drivers	[PATCH] uml: fix patch mismerge	2006-05-01 18:17:44 -07:00
include	[PATCH] uml: fix wall_to_monotonic initialization	2006-06-05 12:29:17 -07:00
kernel	Merge git://git.infradead.org/~dwmw2/rbtree-2.6	2006-06-20 14:51:22 -07:00
os-Linux	[PATCH] uml: fix a typo in do_uml_initcalls	2006-06-05 12:29:17 -07:00
scripts	[PATCH] uml: cleanup unprofile expression and build infrastructure	2006-05-01 18:17:45 -07:00
sys-i386	[PATCH] uml: more __user annotations	2006-06-05 12:29:17 -07:00
sys-ia64
sys-ppc
sys-x86_64	[PATCH] uml: more __user annotations	2006-06-05 12:29:17 -07:00
config.release
defconfig	[PATCH] uml: update defconfig	2006-05-01 18:17:44 -07:00
Kconfig
Kconfig.char
Kconfig.debug
Kconfig.i386
Kconfig.net
Kconfig.scsi
Kconfig.x86_64
Makefile	[PATCH] uml: uml-makefile-nicer uses SYMLINK incorrectly	2006-05-01 18:17:45 -07:00
Makefile-i386	[PATCH] uml: add -ffreestanding to CFLAGS	2006-06-05 12:29:17 -07:00
Makefile-ia64
Makefile-os-Linux
Makefile-ppc
Makefile-skas
Makefile-tt
Makefile-x86_64