Merge ../linus

diff --combined include/linux/mm.h
index 4fba4560699b1852f06538f39354f98500b6006c,f0b135cd86da1e54789bce46eb7bb8f6487edcaa..224178a000d2e1930c13b5db60642de3d0bd4ff6
--- 1/include/linux/mm.h
--- 2/include/linux/mm.h
+++ b/include/linux/mm.h
@@@ -336,6 -336,7 +336,7 @@@ static inline void init_page_count(stru
  }
  
  void put_page(struct page *page);
+ void put_pages_list(struct list_head *pages);
  
  void split_page(struct page *page, unsigned int order);
  
@@@ -1012,7 -1013,6 +1013,7 @@@ static inline unsigned long vma_pages(s
        return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
  }
  
 +pgprot_t vm_get_page_prot(unsigned long vm_flags);
  struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
  struct page *vmalloc_to_page(void *addr);
  unsigned long vmalloc_to_pfn(void *addr);