Merge branch 'merge'

diff --cc arch/powerpc/Kconfig
Simple merge

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

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

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

diff --cc arch/powerpc/kernel/prom_parse.c
index 6032032,a10825a..603dff3
--- 1/arch/powerpc/kernel/prom_parse.c
--- 2/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@@ -642,11 -639,11 +642,11 @@@ void of_irq_map_init(unsigned int flags
  
  }
  
- int of_irq_map_raw(struct device_node *parent, const u32 *intspec,
 -int of_irq_map_raw(struct device_node *parent, u32 *intspec, u32 ointsize,
 -                 u32 *addr, struct of_irq *out_irq)
++int of_irq_map_raw(struct device_node *parent, const u32 *intspec, u32 ointsize,
 +              const u32 *addr, struct of_irq *out_irq)
  {
        struct device_node *ipar, *tnode, *old = NULL, *newpar = NULL;
 -      u32 *tmp, *imap, *imask;
 +      const u32 *tmp, *imap, *imask;
        u32 intsize = 1, addrsize, newintsize = 0, newaddrsize = 0;
        int imaplen, match, i;
  

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

diff --cc arch/powerpc/platforms/83xx/mpc834x_itx.c
Simple merge

diff --cc arch/powerpc/platforms/83xx/mpc834x_sys.c
Simple merge

diff --cc arch/powerpc/platforms/83xx/pci.c
Simple merge

diff --cc arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
Simple merge

diff --cc drivers/net/spider_net.c
Simple merge

diff --cc drivers/video/riva/fbdev.c
Simple merge

diff --cc include/asm-powerpc/prom.h
index 7a457bd,d0fa1b9..c15e66a
--- 1/include/asm-powerpc/prom.h
--- 2/include/asm-powerpc/prom.h
+++ b/include/asm-powerpc/prom.h
@@@ -288,11 -289,12 +289,12 @@@ extern void of_irq_map_init(unsigned in
   *
   */
  
 -extern int of_irq_map_raw(struct device_node *parent, u32 *intspec,
 -                        u32 ointsize, u32 *addr,
 +extern int of_irq_map_raw(struct device_node *parent, const u32 *intspec,
-                         const u32 *addr, struct of_irq *out_irq);
++                        u32 ointsize, const u32 *addr,
+                         struct of_irq *out_irq);
  
  
 -/***
 +/**
   * of_irq_map_one - Resolve an interrupt for a device
   * @device:   the device whose interrupt is to be resolved
   * @index:            index of the interrupt to resolve