Merge commit 'origin/master' into next

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

diff --cc arch/powerpc/boot/dts/canyonlands.dts
Simple merge

diff --cc arch/powerpc/include/asm/mmu-book3e.h
index c5363c3a720733ac3da0b4836f038dcaaba1af0c,0000000000000000000000000000000000000000..7e74cff81d864556b12030da29805d590334fe9a
mode 100644,000000..100644
--- 1/arch/powerpc/include/asm/mmu-book3e.h
--- /dev/null
+++ b/arch/powerpc/include/asm/mmu-book3e.h
@@@ -1,103 -1,0 +1,105 @@@
 +#ifndef _ASM_POWERPC_MMU_BOOK3E_H_
 +#define _ASM_POWERPC_MMU_BOOK3E_H_
 +/*
 + * Freescale Book-E/Book-3e (ISA 2.06+) MMU support
 + */
 +
 +/* Book-3e defined page sizes */
 +#define BOOK3E_PAGESZ_1K      0
 +#define BOOK3E_PAGESZ_2K      1
 +#define BOOK3E_PAGESZ_4K      2
 +#define BOOK3E_PAGESZ_8K      3
 +#define BOOK3E_PAGESZ_16K     4
 +#define BOOK3E_PAGESZ_32K     5
 +#define BOOK3E_PAGESZ_64K     6
 +#define BOOK3E_PAGESZ_128K    7
 +#define BOOK3E_PAGESZ_256K    8
 +#define BOOK3E_PAGESZ_512K    9
 +#define BOOK3E_PAGESZ_1M      10
 +#define BOOK3E_PAGESZ_2M      11
 +#define BOOK3E_PAGESZ_4M      12
 +#define BOOK3E_PAGESZ_8M      13
 +#define BOOK3E_PAGESZ_16M     14
 +#define BOOK3E_PAGESZ_32M     15
 +#define BOOK3E_PAGESZ_64M     16
 +#define BOOK3E_PAGESZ_128M    17
 +#define BOOK3E_PAGESZ_256M    18
 +#define BOOK3E_PAGESZ_512M    19
 +#define BOOK3E_PAGESZ_1GB     20
 +#define BOOK3E_PAGESZ_2GB     21
 +#define BOOK3E_PAGESZ_4GB     22
 +#define BOOK3E_PAGESZ_8GB     23
 +#define BOOK3E_PAGESZ_16GB    24
 +#define BOOK3E_PAGESZ_32GB    25
 +#define BOOK3E_PAGESZ_64GB    26
 +#define BOOK3E_PAGESZ_128GB   27
 +#define BOOK3E_PAGESZ_256GB   28
 +#define BOOK3E_PAGESZ_512GB   29
 +#define BOOK3E_PAGESZ_1TB     30
 +#define BOOK3E_PAGESZ_2TB     31
 +
 +#define MAS0_TLBSEL(x)        ((x << 28) & 0x30000000)
 +#define MAS0_ESEL(x)  ((x << 16) & 0x0FFF0000)
 +#define MAS0_NV(x)    ((x) & 0x00000FFF)
 +
 +#define MAS1_VALID    0x80000000
 +#define MAS1_IPROT    0x40000000
 +#define MAS1_TID(x)   ((x << 16) & 0x3FFF0000)
 +#define MAS1_IND      0x00002000
 +#define MAS1_TS               0x00001000
 +#define MAS1_TSIZE(x) ((x << 7) & 0x00000F80)
 +
 +#define MAS2_EPN      0xFFFFF000
 +#define MAS2_X0               0x00000040
 +#define MAS2_X1               0x00000020
 +#define MAS2_W                0x00000010
 +#define MAS2_I                0x00000008
 +#define MAS2_M                0x00000004
 +#define MAS2_G                0x00000002
 +#define MAS2_E                0x00000001
 +#define MAS2_EPN_MASK(size)           (~0 << (size + 10))
 +#define MAS2_VAL(addr, size, flags)   ((addr) & MAS2_EPN_MASK(size) | (flags))
 +
 +#define MAS3_RPN      0xFFFFF000
 +#define MAS3_U0               0x00000200
 +#define MAS3_U1               0x00000100
 +#define MAS3_U2               0x00000080
 +#define MAS3_U3               0x00000040
 +#define MAS3_UX               0x00000020
 +#define MAS3_SX               0x00000010
 +#define MAS3_UW               0x00000008
 +#define MAS3_SW               0x00000004
 +#define MAS3_UR               0x00000002
 +#define MAS3_SR               0x00000001
 +
 +#define MAS4_TLBSELD(x) MAS0_TLBSEL(x)
 +#define MAS4_INDD     0x00008000
 +#define MAS4_TSIZED(x)        MAS1_TSIZE(x)
 +#define MAS4_X0D      0x00000040
 +#define MAS4_X1D      0x00000020
 +#define MAS4_WD               0x00000010
 +#define MAS4_ID               0x00000008
 +#define MAS4_MD               0x00000004
 +#define MAS4_GD               0x00000002
 +#define MAS4_ED               0x00000001
 +
 +#define MAS6_SPID0    0x3FFF0000
 +#define MAS6_SPID1    0x00007FFE
 +#define MAS6_ISIZE(x) MAS1_TSIZE(x)
 +#define MAS6_SAS      0x00000001
 +#define MAS6_SPID     MAS6_SPID0
 +
 +#define MAS7_RPN      0xFFFFFFFF
 +
 +#ifndef __ASSEMBLY__
 +
++extern unsigned int tlbcam_index;
++
 +typedef struct {
 +      unsigned int    id;
 +      unsigned int    active;
 +      unsigned long   vdso_base;
 +} mm_context_t;
 +#endif /* !__ASSEMBLY__ */
 +
 +#endif /* _ASM_POWERPC_MMU_BOOK3E_H_ */

diff --cc arch/powerpc/include/asm/ps3fb.h
index 1a91daf362c8f75ccccff8e6ae279d697e1c3506,e7233a849680ce4595f8b9afc345593b9431d6ce..90dbefb8cfc4a01528c1700f123e870c160decab
--- 1/arch/powerpc/include/asm/ps3fb.h
--- 2/arch/powerpc/include/asm/ps3fb.h
+++ b/arch/powerpc/include/asm/ps3fb.h
@@@ -19,8 -19,8 +19,9 @@@
  #ifndef _ASM_POWERPC_PS3FB_H_
  #define _ASM_POWERPC_PS3FB_H_
  
+ #include <linux/types.h>
  #include <linux/ioctl.h>
 +#include <linux/types.h>
  
  /* ioctl */
  #define PS3FB_IOCTL_SETMODE       _IOW('r',  1, int) /* set video mode */

diff --cc arch/powerpc/kernel/asm-offsets.c
Simple merge

diff --cc arch/powerpc/kernel/irq.c
Simple merge

diff --cc arch/powerpc/kernel/vmlinux.lds.S
Simple merge

diff --cc arch/x86/kernel/dumpstack.c
Simple merge

diff --cc drivers/i2c/busses/i2c-mpc.c
index 3163eab3f608160586b796725970ffb0c6d7e102,2b847d8759469976513b919e48134e64024e3a44..26bf3701058648ad338847631122101eb37c691f
--- 1/drivers/i2c/busses/i2c-mpc.c
--- 2/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@@ -115,10 -115,13 +115,10 @@@ static int i2c_wait(struct mpc_i2c *i2c
                writeb(0, i2c->base + MPC_I2C_SR);
        } else {
                /* Interrupt mode */
 -              result = wait_event_interruptible_timeout(i2c->queue,
 +              result = wait_event_timeout(i2c->queue,
-                       (i2c->interrupt & CSR_MIF), timeout * HZ);
+                       (i2c->interrupt & CSR_MIF), timeout);
  
 -              if (unlikely(result < 0)) {
 -                      pr_debug("I2C: wait interrupted\n");
 -                      writeccr(i2c, 0);
 -              } else if (unlikely(!(i2c->interrupt & CSR_MIF))) {
 +              if (unlikely(!(i2c->interrupt & CSR_MIF))) {
                        pr_debug("I2C: wait timeout\n");
                        writeccr(i2c, 0);
                        result = -ETIMEDOUT;

diff --cc drivers/watchdog/Kconfig
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge