Merge commit 'origin/master' into next

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

1 files changed, 18 insertions, 18 deletions

diff --git a/include/mtd/inftl-user.h b/include/mtd/inftl-user.h
index d409d489d900..8376bd1a9e01 100644
--- a/include/mtd/inftl-user.h
+++ b/include/mtd/inftl-user.h
@@ -16,33 +16,33 @@
 /* Block Control Information */
 
 struct inftl_bci {
-        uint8_t ECCsig[6];
-        uint8_t Status;
-        uint8_t Status1;
+        __u8 ECCsig[6];
+        __u8 Status;
+        __u8 Status1;
 } __attribute__((packed));
 
 struct inftl_unithead1 {
-        uint16_t virtualUnitNo;
-        uint16_t prevUnitNo;
-        uint8_t ANAC;
-        uint8_t NACs;
-        uint8_t parityPerField;
-        uint8_t discarded;
+        __u16 virtualUnitNo;
+        __u16 prevUnitNo;
+        __u8 ANAC;
+        __u8 NACs;
+        __u8 parityPerField;
+        __u8 discarded;
 } __attribute__((packed));
 
 struct inftl_unithead2 {
-        uint8_t parityPerField;
-        uint8_t ANAC;
-        uint16_t prevUnitNo;
-        uint16_t virtualUnitNo;
-        uint8_t NACs;
-        uint8_t discarded;
+        __u8 parityPerField;
+        __u8 ANAC;
+        __u16 prevUnitNo;
+        __u16 virtualUnitNo;
+        __u8 NACs;
+        __u8 discarded;
 } __attribute__((packed));
 
 struct inftl_unittail {
-        uint8_t Reserved[4];
-        uint16_t EraseMark;
-        uint16_t EraseMark1;
+        __u8 Reserved[4];
+        __u16 EraseMark;
+        __u16 EraseMark1;
 } __attribute__((packed));
 
 union inftl_uci {