Merge branch 'sh/stable-updates'
Conflicts: arch/sh/kernel/dwarf.c
This commit is contained in:
Paul Mundt
@@ -72,7 +72,6 @@
|
||||
#include <asm/irq.h>
|
||||
#include <asm/gpio.h>
|
||||
|
||||
#include <asm/mach/mmc.h>
|
||||
#include <mach/board.h>
|
||||
#include <mach/cpu.h>
|
||||
#include <mach/at91_mci.h>
|
||||
|
||||
Reference in New Issue
Block a user