Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git

Conflicts:

	arch/parisc/hpux/sys_hpux.c
	arch/parisc/mm/ioremap.c

diff --cc arch/parisc/hpux/sys_hpux.c
Simple merge

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

diff --cc arch/parisc/mm/ioremap.c
index 44b42c7f639d073b0339396a8ecd8d4c908f7340,6c6102307c0653d7319b3ab2af7cc96b81e74da9..92d496ad07c97b9be730f8799bf96f7c5a538d3b
--- 1/arch/parisc/mm/ioremap.c
--- 2/arch/parisc/mm/ioremap.c
+++ b/arch/parisc/mm/ioremap.c
@@@ -26,10 -128,9 +26,10 @@@
   */
  void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags)
  {
-       void *addr;
+       void __iomem *addr;
        struct vm_struct *area;
        unsigned long offset, last_addr;
 +      pgprot_t pgprot;
  
  #ifdef CONFIG_EISA
        unsigned long end = phys_addr + size - 1;
@@@ -80,9 -178,8 +80,9 @@@
        if (!area)
                return NULL;
  
-       addr = area->addr;
+       addr = (void __iomem *) area->addr;
 -      if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
 +      if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size,
 +                             phys_addr, pgprot)) {
                vfree(addr);
                return NULL;
        }

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/serial/mux.c
Simple merge

diff --cc scripts/mod/modpost.c
Simple merge