Merge branch 'sh/stable-updates'

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

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt
2010-04-26 16:08:27 +09:00
4674 changed files with 28482 additions and 5759 deletions

View File

@@ -50,6 +50,7 @@
#include <linux/list.h>
#include <linux/dmaengine.h>
#include <linux/scatterlist.h>
#include <linux/slab.h>
#ifdef CONFIG_SUPERH
#include <asm/sh_bios.h>