Merge branch 'fixes' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm

* 'fixes' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm:
  ARM: sa11x0: assabet: fix build warning
  ARM: Add arm_memblock_steal() to allocate memory away from the kernel
  ARM: 7275/1: LPAE: Check the CPU support for the long descriptor format
  ARM: 7274/1: NUC900: Rename nuc900-audio platform device to nuc900-ac97
  ARM: 7272/1: S3C24XX: Fix build error for missing <mach/system-reset.h>
  ARM: 7271/1: Fix typo in conversion of ARCH_NR_GPIOS to Kconfig

diff --combined arch/arm/mach-sa1100/assabet.c
index 5bc6b3837b2033cbaccf57b69b91e07ffd0fe76f,0c4b76ab4d8eba0037e305d5d8f9b17b36074fa7..ebafe8aa8956e1d9f7e24987e777ce7d87f27369
--- 1/arch/arm/mach-sa1100/assabet.c
--- 2/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@@ -202,7 -202,6 +202,7 @@@ static struct irda_platform_data assabe
  static struct mcp_plat_data assabet_mcp_data = {
        .mccr0          = MCCR0_ADM,
        .sclk_rate      = 11981000,
 +      .codec          = "ucb1x00",
  };
  
  static void __init assabet_init(void)
@@@ -253,17 -252,6 +253,17 @@@
        sa11x0_register_mtd(&assabet_flash_data, assabet_flash_resources,
                            ARRAY_SIZE(assabet_flash_resources));
        sa11x0_register_irda(&assabet_irda_data);
 +
 +      /*
 +       * Setup the PPC unit correctly.
 +       */
 +      PPDR &= ~PPC_RXD4;
 +      PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;
 +      PSDR |= PPC_RXD4;
 +      PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
 +      PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);
 +
 +      ASSABET_BCR_set(ASSABET_BCR_CODEC_RST);
        sa11x0_register_mcp(&assabet_mcp_data);
  }
  
@@@ -280,7 -268,7 +280,7 @@@ static void __init map_sa1100_gpio_regs
        int prot = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_DOMAIN(DOMAIN_IO);
        pmd_t *pmd;
  
-       pmd = pmd_offset(pgd_offset_k(virt), virt);
+       pmd = pmd_offset(pud_offset(pgd_offset_k(virt), virt), virt);
        *pmd = __pmd(phys | prot);
        flush_pmd_entry(pmd);
  }