]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'arm-lpae/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 12 Aug 2011 01:01:58 +0000 (11:01 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 12 Aug 2011 01:01:58 +0000 (11:01 +1000)
commit317c4d2ebc0f53f28292afc32d1af5b0586ec37a
tree36013807a7541e76e10e60733cc0c63750c23c1e
parentae0394499c03d697310c5700fa0aac766bfdd8b3
parent6a692549726ad9153893291d29b5008ccacbc32d
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/Kconfig
arch/arm/kernel/module.c
arch/arm/mm/alignment.c