Benjamin Herrenschmidt 9ff9a26b78 Merge commit 'origin/master' into next ...

Manual merge of:
	arch/powerpc/include/asm/elf.h
	drivers/i2c/busses/i2c-mpc.c

2009-03-30 14:04:53 +11:00

..

asm

Merge commit 'origin/master' into next

2009-03-30 14:04:53 +11:00