Merge branch 'stable-3.2' into pandora-3.2

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/arm/Kconfig
index 733f9b3,790ea68..7e8ab4e
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1,11 -1,8 +1,10 @@@
  config ARM
        bool
        default y
-       select HAVE_AOUT
        select HAVE_DMA_API_DEBUG
        select HAVE_IDE if PCI || ISA || PCMCIA
 +      select HAVE_DMA_ATTRS
 +      select HAVE_DMA_CONTIGUOUS if MMU
        select HAVE_MEMBLOCK
        select RTC_LIB
        select SYS_SUPPORTS_APM_EMULATION

diff --cc arch/arm/boot/compressed/head.S
Simple merge

diff --cc arch/arm/mm/flush.c
Simple merge

diff --cc arch/arm/mm/init.c
Simple merge

diff --cc arch/arm/mm/nommu.c
Simple merge

diff --cc arch/powerpc/kernel/sysfs.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc drivers/base/memory.c
index f17e3ea,732ad0d..38d0a34
--- 1/drivers/base/memory.c
--- 2/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@@ -151,9 -169,11 +151,11 @@@ static ssize_t show_mem_removable(struc
        unsigned long i, pfn;
        int ret = 1;
        struct memory_block *mem =
 -              container_of(dev, struct memory_block, sysdev);
 +              container_of(dev, struct memory_block, dev);
  
        for (i = 0; i < sections_per_block; i++) {
+               if (!present_section_nr(mem->start_section_nr + i))
+                       continue;
                pfn = section_nr_to_pfn(mem->start_section_nr + i);
                ret &= is_mem_section_removable(pfn, PAGES_PER_SECTION);
        }

diff --cc fs/debugfs/inode.c
Simple merge

diff --cc fs/exec.c
Simple merge

diff --cc fs/fat/inode.c
Simple merge

diff --cc fs/ubifs/dir.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/hugetlb.c
Simple merge

diff --cc mm/page_alloc.c
index dceb1be,d8762b2..38cd47d
--- 1/mm/page_alloc.c
--- 2/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@@ -1890,10 -1756,16 +1890,17 @@@ void warn_alloc_failed(gfp_t gfp_mask, 
  {
        unsigned int filter = SHOW_MEM_FILTER_NODES;
  
 -      if ((gfp_mask & __GFP_NOWARN) || !__ratelimit(&nopage_rs))
 +      if ((gfp_mask & __GFP_NOWARN) || !__ratelimit(&nopage_rs) ||
 +          debug_guardpage_minorder() > 0)
                return;
  
+       /*
+        * Walking all memory to count page types is very expensive and should
+        * be inhibited in non-blockable contexts.
+        */
+       if (!(gfp_mask & __GFP_WAIT))
+               filter |= SHOW_MEM_FILTER_PAGE_COUNT;
+ 
        /*
         * This documents exceptions given to allocations in certain
         * contexts that are allowed to allocate outside current's set