From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 20 Jun 2006 21:51:22 +0000 (-0700)
Subject: Merge git://git.infradead.org/~dwmw2/rbtree-2.6
X-Git-Tag: v2.6.18-rc1~1104
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6;p=pandora-kernel.git

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
---

2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6
Reading git-diff-tree failed