Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (45 commits)
  ARM: 6945/1: Add unwinding support for division functions
  ARM: kill pmd_off()
  ARM: 6944/1: mm: allow ASID 0 to be allocated to tasks
  ARM: 6943/1: mm: use TTBR1 instead of reserved context ID
  ARM: 6942/1: mm: make TTBR1 always point to swapper_pg_dir on ARMv6/7
  ARM: 6941/1: cache: ensure MVA is cacheline aligned in flush_kern_dcache_area
  ARM: add sendmmsg syscall
  ARM: 6863/1: allow hotplug on msm
  ARM: 6832/1: mmci: support for ST-Ericsson db8500v2
  ARM: 6830/1: mach-ux500: force PrimeCell revisions
  ARM: 6829/1: amba: make hardcoded periphid override hardware
  ARM: 6828/1: mach-ux500: delete SSP PrimeCell ID
  ARM: 6827/1: mach-netx: delete hardcoded periphid
  ARM: 6940/1: fiq: Briefly document driver responsibilities for suspend/resume
  ARM: 6938/1: fiq: Refactor {get,set}_fiq_regs() for Thumb-2
  ARM: 6914/1: sparsemem: fix highmem detection when using SPARSEMEM
  ARM: 6913/1: sparsemem: allow pfn_valid to be overridden when using SPARSEMEM
  at91: drop at572d940hf support
  at91rm9200: introduce at91rm9200_set_type to specficy cpu package
  at91: drop boot_params and PLAT_PHYS_OFFSET
  ...

diff --combined include/linux/mmzone.h
index 29312bdf119f880463fcf6bdc0407edd81c243f2,261f299c94412be90e5b24e6b2406bc9815ee608..c928dac6cad0c3b1022ebdca9d53ecef1865b797
--- 1/include/linux/mmzone.h
--- 2/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@@ -273,6 -273,11 +273,6 @@@ struct zone_reclaim_stat 
         */
        unsigned long           recent_rotated[2];
        unsigned long           recent_scanned[2];
 -
 -      /*
 -       * accumulated for batching
 -       */
 -      unsigned long           nr_saved_scan[NR_LRU_LISTS];
  };
  
  struct zone {
@@@ -1051,12 -1056,14 +1051,14 @@@ static inline struct mem_section *__pfn
        return __nr_to_section(pfn_to_section_nr(pfn));
  }
  
+ #ifndef CONFIG_HAVE_ARCH_PFN_VALID
  static inline int pfn_valid(unsigned long pfn)
  {
        if (pfn_to_section_nr(pfn) >= NR_MEM_SECTIONS)
                return 0;
        return valid_section(__nr_to_section(pfn_to_section_nr(pfn)));
  }
+ #endif
  
  static inline int pfn_present(unsigned long pfn)
  {