| commit | 6424db52e24e8cdf89917fa3c10395116440160e | [log] [tgz] |
|---|---|---|
| author | Paul Mundt <lethal@linux-sh.org> | Tue Dec 08 15:47:12 2009 +0900 |
| committer | Paul Mundt <lethal@linux-sh.org> | Tue Dec 08 15:47:12 2009 +0900 |
| tree | bd923d78f90addb080abc82f3bff6ca5c9bf10b4 | |
| parent | 09a072947791088b88ae15111cf68fc5aaaf758d [diff] | |
| parent | 6a5a0b9139b19dd1a107870269a35bc9cf18d2dc [diff] |
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