Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Sun, 14 Sep 2014 15:35:36 +0000 (18:35 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Sun, 14 Sep 2014 15:35:36 +0000 (18:35 +0300)
commit43ec2237a263b793fdc1e741c37b1362441183c2
tree5f8fd5257083b2fbe14e6b9d80a1e76c5908f625
parent318d016e58d6c63cfb32ebb55194cd4554dfaf68
parentde9ba611731e25d18cdf634de785d2630e3e36c8
Merge branch 'stable-3.2' into pandora-3.2

Conflicts:
mm/truncate.c
arch/arm/Kconfig
arch/arm/kernel/entry-header.S
arch/x86/Kconfig
fs/debugfs/inode.c
fs/namespace.c
kernel/trace/trace.c
mm/hugetlb.c
mm/page_alloc.c
mm/shmem.c
mm/vmalloc.c