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-16 09:09:56 -07:00
2005-10-18 08:26:15 -07:00
2008-04-20 21:47:02 -07:00
2008-04-20 21:47:06 -07:00
2008-04-20 21:47:13 -07:00
2008-07-18 22:50:34 +02:00
2006-12-01 14:36:56 -08:00
2008-08-07 15:33:36 -07:00
2008-04-20 21:47:03 -07:00
2008-03-03 10:47:14 -08:00
2008-06-25 16:05:13 -07:00
2008-06-25 16:05:13 -07:00
2008-06-10 14:37:03 -07:00