tree ac00daa548ea8ac24ae7a5c8062312e335ab9858
parent cde274c0c789404df8ece3f9e7d6506caf0127e2
parent bce7f793daec3e65ec5c5705d2457b81fe7b5725
author Benjamin Herrenschmidt <benh@kernel.crashing.org> 1216009789 +1000
committer Benjamin Herrenschmidt <benh@kernel.crashing.org> 1216009789 +1000

Merge commit 'origin/HEAD' into test-merge

Manual fixup of include/asm-powerpc/pgtable-ppc64.h