Merge branches 'genesis/dmaengine', 'genesis/intc-extension' and 'genesis/i2c-updates'

diff --cc drivers/dma/shdma.c
Simple merge

diff --cc drivers/serial/sh-sci.c
index cd52dd64edf0bf4568e9c142c47a9b2b94e5f388,980f39449ee5635ccb7b4f681151892e92a493b0,8eb094c1f61b2c2ab17cb68e420f16ad42428823..78e0545243d0f0d6b2aed2bfe2f63ab8e13fa08e
--- 1/drivers/serial/sh-sci.c
--- 2/drivers/serial/sh-sci.c
--- 3/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@@@ -50,6 -50,7 -50,7 +50,7 @@@@
   #include <linux/list.h>
   #include <linux/dmaengine.h>
   #include <linux/scatterlist.h>
 - #include <linux/timer.h>
++ #include <linux/slab.h>
   
   #ifdef CONFIG_SUPERH
   #include <asm/sh_bios.h>

diff --cc drivers/sh/intc.c
Simple merge