Merge branch 'master' into sh/hw-breakpoints
authorPaul Mundt <lethal@linux-sh.org>
Tue, 8 Dec 2009 06:47:12 +0000 (15:47 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 8 Dec 2009 06:47:12 +0000 (15:47 +0900)
commit6424db52e24e8cdf89917fa3c10395116440160e
treebd923d78f90addb080abc82f3bff6ca5c9bf10b4
parent09a072947791088b88ae15111cf68fc5aaaf758d
parent6a5a0b9139b19dd1a107870269a35bc9cf18d2dc
Merge branch 'master' into sh/hw-breakpoints

Conflict between FPU thread flag migration and debug
thread flag addition.

Conflicts:
arch/sh/include/asm/thread_info.h
arch/sh/include/asm/ubc.h
arch/sh/kernel/process_32.c
arch/sh/Kconfig
arch/sh/include/asm/processor_32.h
arch/sh/include/asm/system.h
arch/sh/include/asm/thread_info.h
arch/sh/include/asm/ubc.h
arch/sh/kernel/Makefile
arch/sh/kernel/process_32.c