]> 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>
Sun, 13 Nov 2011 23:39:49 +0000 (10:39 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 13 Nov 2011 23:39:49 +0000 (10:39 +1100)
commitae94ae7b017a7c6e115b661def24eccfbca39b96
tree3e023b8a96a9200d8b8e3b93ad059b714913c641
parent61ebd6fadfae21bbcdedb88101ef6dd161ece067
parentb38209677687570bcab416b022343f175f1145b4
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/include/asm/system.h
arch/arm/kernel/head.S
arch/arm/kernel/setup.c
arch/arm/mm/idmap.c