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-09 08:56:19 +02:00
2008-10-09 08:56:19 +02:00
2008-07-04 09:52:13 +02:00
2008-10-15 11:31:54 +11:00
2008-10-10 22:39:21 +02:00
2008-07-16 20:33:47 +02:00
2008-04-29 14:48:33 +02:00
2008-10-09 08:57:05 +02:00
2008-02-14 20:58:04 -08:00
2008-05-02 10:25:52 -07:00