Merge branch 'stable-3.2' into pandora-3.2
authornotaz <notasas@gmail.com>
Sun, 13 Apr 2014 16:21:38 +0000 (19:21 +0300)
committernotaz <notasas@gmail.com>
Sun, 13 Apr 2014 16:21:38 +0000 (19:21 +0300)
commit7a99657f9dc3c00998e6313295832687b70ed52f
tree47c60141a031682daef756f1b859d3aa69072280
parente43bf769ca49db21d79e9d4bc6124d31da8b3018
parenta2601fcca1caa1645a8bf6c7719ec9e41f590a28
Merge branch 'stable-3.2' into pandora-3.2

Conflicts:
arch/arm/mm/proc-v7.S
22 files changed:
Documentation/kernel-parameters.txt
arch/arm/include/asm/assembler.h
arch/arm/include/asm/cacheflush.h
arch/arm/kernel/process.c
arch/arm/kernel/traps.c
arch/arm/mach-pxa/reset.c
arch/arm/mm/proc-v6.S
arch/arm/mm/proc-v7.S
drivers/mmc/card/block.c
drivers/net/usb/asix.c
drivers/net/wireless/libertas/debugfs.c
fs/exec.c
fs/file.c
fs/splice.c
kernel/irq/pm.c
kernel/sched.c
mm/hugetlb.c
mm/memory-failure.c
mm/oom_kill.c
mm/page-writeback.c
mm/swap.c
mm/swapfile.c