Merge remote-tracking branch 'cmarinas/master' into android-t114-3.4-rebased
authorVarun Wadekar <vwadekar@nvidia.com>
Wed, 20 Jun 2012 11:11:36 +0000 (16:11 +0530)
committerVarun Wadekar <vwadekar@nvidia.com>
Wed, 20 Jun 2012 11:11:36 +0000 (16:11 +0530)
commitc20a9d34438ca68185ff27b680790f2eeb0a52ab
tree24ff7e6cf9aa6dd4e54baa05c260ded5932bda36
parentab8469437be95034d5da31d60bf2003e435285db
parent4b35c24f445ecbdb88b2dfcf3b7ec57973464bfe
Merge remote-tracking branch 'cmarinas/master' into android-t114-3.4-rebased

Conflicts:
arch/arm/mm/cache-l2x0.c
arch/arm/mm/proc-v7-2level.S

Change-Id: Id40c1d976a828e4fd3cde15c1b478fa2c42aeb2a
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
arch/arm/mm/cache-l2x0.c
arch/arm/mm/mmu.c
mm/mmap.c