summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mmp/ttc_dkb.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-12-08 15:47:12 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-12-08 15:47:12 +0900
commit6424db52e24e8cdf89917fa3c10395116440160e (patch)
treebd923d78f90addb080abc82f3bff6ca5c9bf10b4 /arch/arm/mach-mmp/ttc_dkb.c
parent09a072947791088b88ae15111cf68fc5aaaf758d (diff)
parent6a5a0b9139b19dd1a107870269a35bc9cf18d2dc (diff)
downloadop-kernel-dev-6424db52e24e8cdf89917fa3c10395116440160e.zip
op-kernel-dev-6424db52e24e8cdf89917fa3c10395116440160e.tar.gz
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
Diffstat (limited to 'arch/arm/mach-mmp/ttc_dkb.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud