Merge branch 'stable-3.2' into pandora-3.2

Conflicts:
	drivers/mtd/ubi/vtbl.c

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/include/asm/pgtable.h
Simple merge

diff --cc drivers/mtd/ubi/vtbl.c
index 437bc19,95b29f5..568307c
--- 1/drivers/mtd/ubi/vtbl.c
--- 2/drivers/mtd/ubi/vtbl.c
+++ b/drivers/mtd/ubi/vtbl.c
@@@ -336,11 -341,12 +336,11 @@@ retry
                goto write_error;
  
        /*
 -       * And add it to the scanning information. Don't delete the old version
 -       * of this LEB as it will be deleted and freed in 'ubi_scan_add_used()'.
 +       * And add it to the attaching information. Don't delete the old version
 +       * of this LEB as it will be deleted and freed in 'ubi_add_to_av()'.
         */
 -      err = ubi_scan_add_used(ubi, si, new_seb->pnum, new_seb->ec,
 -                              vid_hdr, 0);
 -      kmem_cache_free(si->scan_leb_slab, new_seb);
 +      err = ubi_add_to_av(ubi, ai, new_aeb->pnum, new_aeb->ec, vid_hdr, 0);
-       kfree(new_aeb);
++      kmem_cache_free(ai->aeb_slab_cache, new_aeb);
        ubi_free_vid_hdr(ubi, vid_hdr);
        return err;
  
@@@ -350,10 -356,10 +350,10 @@@ write_error
                 * Probably this physical eraseblock went bad, try to pick
                 * another one.
                 */
 -              list_add(&new_seb->u.list, &si->erase);
 +              list_add(&new_aeb->u.list, &ai->erase);
                goto retry;
        }
-       kfree(new_aeb);
 -      kmem_cache_free(si->scan_leb_slab, new_seb);
++      kmem_cache_free(ai->aeb_slab_cache, new_aeb);
  out_free:
        ubi_free_vid_hdr(ubi, vid_hdr);
        return err;

diff --cc fs/open.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc mm/memory.c
Simple merge