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-03 16:58:10 +10:00
2008-07-03 16:58:10 +10:00
2007-05-11 05:38:25 -04:00
2008-06-30 22:31:00 +10:00
2008-09-24 16:26:43 -05:00
2008-03-07 08:42:28 -06:00
2008-10-15 10:13:29 +11:00
2008-05-23 22:43:11 +02:00
2008-07-26 12:00:04 -07:00
2008-09-24 16:26:45 -05:00
2008-09-24 16:26:43 -05:00
2008-09-24 16:26:45 -05:00
2008-10-15 11:31:54 +11:00
2007-10-11 14:36:47 +10:00
2008-07-16 11:07:59 +10:00
2008-08-04 13:18:17 +10:00
2008-09-24 16:26:43 -05:00