Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Sat, 22 Sep 2012 21:32:18 +0000 (00:32 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Sat, 22 Sep 2012 21:32:18 +0000 (00:32 +0300)
commit81e0a6ed9888d145d25b7ccece6e1016626bc3c2
treec6019438c553c10afce6c51ef89988dd40643a5f
parent33f77242a125e36ab26776ba0bdb303a498edd3e
parentef00e58c65808c26f4c9f1c3aa45640d7c99bf56
Merge branch 'stable-3.2' into pandora-3.2

Conflicts:
drivers/mtd/ubi/vtbl.c
arch/arm/Kconfig
arch/arm/include/asm/pgtable.h
drivers/mtd/ubi/vtbl.c
fs/open.c
kernel/sched.c
mm/memory.c