Merge commit 'origin'

Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h

diff --cc arch/powerpc/boot/Makefile
Simple merge

diff --cc arch/powerpc/boot/dts/mpc8610_hpcd.dts
Simple merge

diff --cc arch/powerpc/include/asm/sections.h
index baf318a,07956f3..6fbce72
--- 1/arch/powerpc/include/asm/sections.h
--- 2/arch/powerpc/include/asm/sections.h
+++ b/arch/powerpc/include/asm/sections.h
@@@ -16,14 -18,16 +18,22 @@@ static inline int in_kernel_text(unsign
        return 0;
  }
  
 +static inline int overlaps_kernel_text(unsigned long start, unsigned long end)
 +{
 +      return start < (unsigned long)__init_end &&
 +              (unsigned long)_stext < end;
 +}
 +
  #undef dereference_function_descriptor
- void *dereference_function_descriptor(void *);
+ static inline void *dereference_function_descriptor(void *ptr)
+ {
+       struct ppc64_opd_entry *desc = ptr;
+       void *p;
+ 
+       if (!probe_kernel_address(&desc->funcaddr, p))
+               ptr = p;
+       return ptr;
+ }
  
  #endif
  

diff --cc arch/powerpc/kernel/smp.c
Simple merge

diff --cc arch/powerpc/platforms/cell/spufs/inode.c
Simple merge

diff --cc drivers/block/floppy.c
Simple merge

diff --cc drivers/char/hvc_console.c
Simple merge

diff --cc drivers/net/ibm_newemac/Kconfig
Simple merge

diff --cc drivers/net/ibm_newemac/mal.h
Simple merge

diff --cc drivers/net/ibm_newemac/phy.c
Simple merge

diff --cc drivers/pnp/pnpbios/core.c
Simple merge

diff --cc drivers/serial/Kconfig
Simple merge