Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Wed, 6 Feb 2013 15:55:31 +0000 (17:55 +0200)
committerGrazvydas Ignotas <notasas@gmail.com>
Wed, 6 Feb 2013 15:55:31 +0000 (17:55 +0200)
commita1ea43bdfc45efbd4d0a7bd96b5a8389e4639537
treed75be8006dade25374c297cd04114e6165c7eaf2
parentddec008d0b9eb6940d2f4a5bf324a9374bbf88d0
parent8eedd52017a07a5bae2aded2b5023bfba5971af9
Merge branch 'stable-3.2' into pandora-3.2

Conflicts:
drivers/mtd/ubi/attach.c
16 files changed:
arch/arm/Kconfig
arch/arm/kernel/head.S
arch/arm/mm/dma-mapping.c
drivers/mmc/host/omap_hsmmc.c
drivers/mtd/nand/omap2.c
drivers/mtd/ubi/attach.c
drivers/mtd/ubi/build.c
drivers/usb/musb/musb_core.c
fs/exec.c
fs/ubifs/lprops.c
fs/ubifs/ubifs.h
kernel/exit.c
kernel/sched.c
mm/memory.c
mm/shmem.c
mm/truncate.c