Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

Conflicts:

	arch/sparc/kernel/of_device.c

diff --cc arch/sparc/kernel/of_device.c
index 4ef1607,c481d45..c88af7e
--- 1/arch/sparc/kernel/of_device.c
--- 2/arch/sparc/kernel/of_device.c
+++ b/arch/sparc/kernel/of_device.c
@@@ -409,8 -371,12 +415,9 @@@ static void __init build_device_resourc
  
                memcpy(addr, reg, na * 4);
  
 -              /* If the immediate parent has no ranges property to apply,
 -               * just use a 1<->1 mapping.
 -               */
 -              if (of_find_property(pp, "ranges", NULL) == NULL) {
+               flags = bus->get_flags(reg, 0);
+ 
 +              if (use_1to1_mapping(pp)) {
                        result = of_read_addr(addr, na);
                        goto build_res;
                }

diff --cc arch/sparc/kernel/sun4d_smp.c
Simple merge

diff --cc arch/sparc64/Kconfig
Simple merge

diff --cc arch/sparc64/kernel/of_device.c
Simple merge

diff --cc arch/sparc64/mm/init.c
Simple merge