tree 06a5a9a08519950575505273eabced331ed51405
parent ee673eaa72d8d185012b1027a05e25aba18c267f
parent 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e
author Benjamin Herrenschmidt <benh@kernel.crashing.org> 1224030714 +1100
committer Benjamin Herrenschmidt <benh@kernel.crashing.org> 1224030714 +1100

Merge commit 'origin'

Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h