Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	include/linux/nfs_fs.h

Fixed up conflict with kernel header updates.

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
index fc0f0b085ca7..166cb09cae4c 100644
--- a/arch/um/kernel/physmem.c
+++ b/arch/um/kernel/physmem.c
@@ -69,7 +69,7 @@ static void insert_phys_mapping(struct phys_desc *desc)
                 panic("Physical remapping for %p already present",
                       desc->virt);
 
-        rb_link_node(&desc->rb, (*n)->rb_parent, n);
+        rb_link_node(&desc->rb, rb_parent(*n), n);
         rb_insert_color(&desc->rb, &phys_mappings);
 }