| commit | 11c2d8174ed3dc4f1971564732689b4a39129702 | |
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | |
| Mon, 14 Jul 2008 04:29:49 +0000 (14 14:29 +1000) | ||
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | |
| Mon, 14 Jul 2008 04:29:49 +0000 (14 14:29 +1000) | ||
| tree | ac00daa548ea8ac24ae7a5c8062312e335ab9858 | treesnapshot (tar.gz zip) |
| parent | cde274c0c789404df8ece3f9e7d6506caf0127e2 | commitdiff |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 | commitdiff |
Merge commit 'origin/HEAD' into test-merge
Manual fixup of include/asm-powerpc/pgtable-ppc64.h
Manual fixup of include/asm-powerpc/pgtable-ppc64.h
| arch/powerpc/boot/Makefile | diff1 | diff2 | blobhistory |
| drivers/net/ibm_newemac/core.c | diff1 | diff2 | blobhistory |
| include/asm-powerpc/pgtable-ppc64.h | diff1 | diff2 | blobhistory |