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
..
2007-02-14 08:09:53 -08:00
2008-08-05 14:33:46 -07:00
2008-08-05 14:33:46 -07:00
2008-10-01 12:31:12 -07:00
2007-05-08 11:15:15 -07:00
2007-10-16 09:43:10 -07:00
2008-09-13 14:41:52 -07:00
2008-07-24 10:47:30 -07:00