Merge commit 'origin/master' into next

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

1 files changed, 1 insertions, 1 deletions

diff --git a/kernel/relay.c b/kernel/relay.c
index 9d79b7854fa6..8f2179c8056f 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -750,7 +750,7 @@ size_t relay_switch_subbuf(struct rchan_buf *buf, size_t length)
                          * from the scheduler (trying to re-grab
                          * rq->lock), so defer it.
                          */
-                        __mod_timer(&buf->timer, jiffies + 1);
+                        mod_timer(&buf->timer, jiffies + 1);
         }
 
         old = buf->data;