| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 | [log] [tgz] |
|---|---|---|
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | Wed Oct 15 11:31:54 2008 +1100 |
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | Wed Oct 15 11:31:54 2008 +1100 |
| tree | 06a5a9a08519950575505273eabced331ed51405 | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f [diff] | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e [diff] |
Merge commit 'origin' Manual fixup of conflicts on: arch/powerpc/include/asm/dcr-regs.h drivers/net/ibm_newemac/core.h