Merge master.kernel.org:/home/dwmw2/BK/rbtree-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/sched.h
index feb896db75a459fcf92509424c06b6ed0e738006,7e0fdc5aa8f8ed9ba8b2a26e2e7b1cd844a9347b..f0cf18022ae2d63cde5311576125af91d4a1c159
--- 1/include/linux/sched.h
--- 2/include/linux/sched.h
+++ b/include/linux/sched.h
@@@ -173,11 -169,10 +173,11 @@@ struct namespace
  /* Maximum number of active map areas.. This is a random (large) number */
  #define MAX_MAP_COUNT (65536)
  
 -struct kioctx;
 +#include <linux/aio.h>
 +
  struct mm_struct {
        struct vm_area_struct * mmap;           /* list of VMAs */
-       rb_root_t mm_rb;
+       struct rb_root mm_rb;
        struct vm_area_struct * mmap_cache;     /* last find_vma result */
        pgd_t * pgd;
        atomic_t mm_users;                      /* How many users with user space? */

diff --cc mm/mmap.c
Simple merge