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
Simple merge

diff --cc arch/powerpc/include/asm/ps3fb.h
index 1a91daf,e7233a8..90dbefb
--- 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 3163eab,2b847d8..26bf370
--- 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