Hi Linus,
Please pull from 'for-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git for-linus
to receive the following updates:
arch/blackfin/kernel/traps.c | 8 ++---
arch/blackfin/mach-bf527/boards/ezkit.c | 9 +----
arch/blackfin/mach-bf533/boards/ezkit.c | 6 +---
arch/blackfin/mach-bf533/boards/stamp.c | 10 ++----
arch/blackfin/mach-bf537/boards/stamp.c | 9 +----
arch/blackfin/mach-bf548/boards/ezkit.c | 10 ++----
arch/blackfin/mach-bf561/boards/ezkit.c | 9 ++---
drivers/serial/bfin_5xx.c | 40 +++++---------------
include/asm-blackfin/mach-bf527/bfin_serial_5xx.h | 6 +++
include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | 6 +++
include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | 6 +++
include/asm-blackfin/mach-bf548/bfin_serial_5xx.h | 6 +++
include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | 6 +++
13 files changed, 57 insertions(+), 74 deletions(-)
Graf Yang (1):
Blackfin serial driver: fix up tty core set_ldisc API change breakage bug
Mike Frysinger (2):
Blackfin arch: fixup warnings with the new cplb saved values
Blackfin arch: protect only the SPI bus controller with CONFIG_SPI_BFIN
Sonic Zhang (1):
Blackfin Serial Driver: Clean up BF54x macro in blackfin UART driver.
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index 7bfbd95..f061f51 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -67,7 +67,7 @@ void __init trap_init(void)
CSYNC();
}
-void *saved_icplb_fault_addr, *saved_dcplb_fault_addr;
+unsigned long saved_icplb_fault_addr, saved_dcplb_fault_addr;
int kstack_depth_to_print = 48;
@@ -366,7 +366,7 @@ asmlinkage void trap_c(struct pt_regs *fp)
info.si_code = ILL_CPLB_MULHIT;
sig = SIGSEGV;
#ifdef CONFIG_DEBUG_HUNT_FOR_ZERO
- if (saved_dcplb_fault_addr < (void ...