Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Wed, 20 Feb 2013 21:00:34 +0000 (23:00 +0200)
committerGrazvydas Ignotas <notasas@gmail.com>
Wed, 20 Feb 2013 21:00:34 +0000 (23:00 +0200)
commit38b2b5209cd1535ff6a6d8c86080ea7d01fe71f2
tree7eb808af2ebdb73a9abf0e4baa17dda68cb7c425
parent8f763d95d980e12fc2aa09a561980532fc7cec47
parentcd1b44e9d1843228414295e843ef208a72c44b58
Merge branch 'stable-3.2' into pandora-3.2

Conflicts:
drivers/mtd/ubi/attach.c
18 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/splice.c
fs/ubifs/lprops.c
fs/ubifs/ubifs.h
kernel/exit.c
kernel/sched.c
kernel/signal.c
mm/memory.c
mm/shmem.c
mm/truncate.c