From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 Sep 2011 23:58:32 +0000 (+1000)
Subject: Merge remote-tracking branch 'arm-lpae/for-next'
X-Git-Tag: next-20110930~101
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e19ad6e36c882bc9cc093bf9c3d529493517a0c1;p=karo-tx-linux.git

Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
	arch/arm/include/asm/page.h
	arch/arm/include/asm/pgalloc.h
	arch/arm/include/asm/pgtable-hwdef.h
	arch/arm/include/asm/pgtable.h
	arch/arm/include/asm/tlb.h
	arch/arm/kernel/head.S
	arch/arm/mm/mmu.c
---

e19ad6e36c882bc9cc093bf9c3d529493517a0c1