Benjamin Herrenschmidt 6dc6472581 Merge commit 'origin'
Manual fixup of conflicts on:

	arch/powerpc/include/asm/dcr-regs.h
	drivers/net/ibm_newemac/core.h
2008-10-15 11:31:54 +11:00
..
2008-10-15 11:31:54 +11:00
2007-10-10 16:51:52 -07:00
2008-10-15 11:31:54 +11:00
2008-10-15 11:31:54 +11:00