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
..
2006-12-04 16:08:25 +11:00
2008-10-13 11:09:58 -05:00
2008-07-16 11:07:59 +10:00