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
2008-09-24 16:26:43 -05:00
2006-06-21 15:01:29 +10:00
2007-12-03 13:56:25 +11:00