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

diff --cc arch/um/kernel/physmem.c
Simple merge

diff --cc block/as-iosched.c
Simple merge

diff --cc block/cfq-iosched.c
Simple merge

diff --cc block/deadline-iosched.c
Simple merge

diff --cc fs/jffs2/nodelist.h
Simple merge

diff --cc fs/jffs2/readinode.c
Simple merge

diff --cc kernel/hrtimer.c
index 01fa2ae,04ab27d..1832430
--- 1/kernel/hrtimer.c
--- 2/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@@ -582,9 -578,8 +582,9 @@@ void hrtimer_init(struct hrtimer *timer
                clock_id = CLOCK_MONOTONIC;
  
        timer->base = &bases[clock_id];
-       timer->node.rb_parent = HRTIMER_INACTIVE;
+       rb_set_parent(&timer->node, &timer->node);
  }
 +EXPORT_SYMBOL_GPL(hrtimer_init);
  
  /**
   * hrtimer_get_res - get the timer resolution for a clock