Merge branches 'genesis/dmaengine', 'genesis/intc-extension' and 'genesis/i2c-updates'
Paul Mundt [Wed, 7 Apr 2010 07:21:03 +0000 (16:21 +0900)]
1  2  3 
drivers/dma/shdma.c
drivers/serial/sh-sci.c
drivers/sh/intc.c

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