Merge branch 'stable-3.2' into pandora-3.2

diff --cc drivers/mtd/ubi/upd.c
index 1f0c8ef,d1802b0..22cd95c
--- 1/drivers/mtd/ubi/upd.c
--- 2/drivers/mtd/ubi/upd.c
+++ b/drivers/mtd/ubi/upd.c
@@@ -194,8 -195,9 +194,8 @@@ int ubi_start_leb_change(struct ubi_dev
        vol->upd_received = 0;
        vol->changing_leb = 1;
        vol->ch_lnum = req->lnum;
 -      vol->ch_dtype = req->dtype;
  
-       vol->upd_buf = vmalloc(req->bytes);
+       vol->upd_buf = vmalloc(ALIGN((int)req->bytes, ubi->min_io_size));
        if (!vol->upd_buf)
                return -ENOMEM;
  

diff --cc fs/exec.c
Simple merge

diff --cc fs/open.c
Simple merge

diff --cc fs/splice.c
Simple merge

diff --cc kernel/sched.c
Simple merge

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

diff --cc mm/memory.c
Simple merge

diff --cc net/mac80211/rc80211_minstrel_ht.c
Simple merge