Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
	arch/arm/mm/mmu.c

diff --cc arch/arm/mm/mmu.c
index 95f7a1c903262e6cacea7951e7371a57c13cd301,4c7d5cddef355e24ffdd62b065cea57a95304f6f..a4e5cd5c30676446dedd0f8f338206c225086ae9
--- 1/arch/arm/mm/mmu.c
--- 2/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@@ -707,8 -685,8 +707,9 @@@ static void __init alloc_init_pmd(pud_
  }
  
  static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,
-       unsigned long end, unsigned long phys, const struct mem_type *type,
-       bool force_pages)
+                                 unsigned long end, phys_addr_t phys,
 -                                const struct mem_type *type)
++                                const struct mem_type *type,
++                                bool force_pages)
  {
        pud_t *pud = pud_offset(pgd, addr);
        unsigned long next;

diff --cc fs/pstore/ram.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge