Merge branch 'sh/stable-updates'

Conflicts:
	arch/sh/kernel/dwarf.c
	drivers/dma/shdma.c

Signed-off-by: Paul Mundt <[email protected]>
This commit is contained in:
Paul Mundt 2010-04-26 16:08:27 +09:00
commit e19553427c
4674 changed files with 28453 additions and 5730 deletions

View file

@ -20,6 +20,7 @@
#include <linux/irq.h>
#include <linux/module.h>
#include <linux/io.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/sh_intc.h>
#include <linux/sysdev.h>