Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Fri, 2 May 2014 23:14:57 +0000 (02:14 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Fri, 2 May 2014 23:14:57 +0000 (02:14 +0300)
commit5a928e75172fe4bb3895033b2cbc569f4123aa86
tree18d7e3fc6e6546019d9e7ee13c4ab1165b53f630
parent5ee6c9912674b66378fe9d9ed9561baf8025b740
parentf453538a1f5b66168caf9c446c56375246b4ac29
Merge branch 'stable-3.2' into pandora-3.2

Conflicts:
arch/arm/mm/proc-v7.S
arch/arm/include/asm/pgtable-2level.h
arch/arm/include/asm/pgtable.h
arch/arm/mm/Kconfig
arch/arm/mm/mmu.c
arch/arm/mm/proc-macros.S
arch/arm/mm/proc-v7-2level.S
kernel/exit.c
kernel/trace/blktrace.c
mm/hugetlb.c