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
parent 0a3108beea 0d34fb8e93
commit 9ff9a26b78
4402 changed files with 317171 additions and 163158 deletions
--- a/arch/powerpc/include/asm/mmu-book3e.h
+++ b/arch/powerpc/include/asm/mmu-book3e.h
@@ -93,6 +93,8 @@

 #ifndef __ASSEMBLY__

+extern unsigned int tlbcam_index;
+
 typedef struct {
 	unsigned int	id;
 	unsigned int	active;