| commit | 3caaf0f4c2e1258afab5cfe651b9b076a4ac26da | |
| author | Stephen Rothwell <sfr@canb.auug.org.au> | |
| Tue, 23 Aug 2011 01:19:46 +0000 (23 11:19 +1000) | ||
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | |
| Tue, 23 Aug 2011 01:19:46 +0000 (23 11:19 +1000) | ||
| tree | 5527a1efd83e8885e9c7ab5c0e40bff76d9f88f2 | treesnapshot (tar.gz zip) |
| parent | cbcb385b9ba3e3553acbb890606b698f54c55f80 | commitdiff |
| parent | c04b67b8ff6ba324e2c307005366cc0c312c5751 | commitdiff |
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
Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h