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-07-20 17:12:35 -07:00
2008-02-08 09:22:25 -08:00
2008-02-08 09:22:25 -08:00
2008-10-13 09:51:44 -07:00
2008-08-04 17:12:07 -07:00
2008-02-03 14:47:38 +02:00
2008-10-15 11:31:54 +11:00
2008-04-30 08:29:47 -07:00
2006-12-08 08:28:57 -08:00
2008-07-28 18:10:29 +09:00
2007-07-18 08:38:22 -07:00