Fix up delete/modify conflict of arch/ppc/kernel/process.c by hand (it's gone, gone, gone). Signed-off-by: Linus Torvalds <torvalds@osdl.org> |
||
|---|---|---|
| .. | ||
| 4xx | ||
| 8xx | ||
| 83xx | ||
| 85xx | ||
| apus | ||
| cell | ||
| chrp | ||
| embedded6xx | ||
| iseries | ||
| maple | ||
| powermac | ||
| prep | ||
| pseries | ||
| Makefile | ||
Fix up delete/modify conflict of arch/ppc/kernel/process.c by hand (it's gone, gone, gone). Signed-off-by: Linus Torvalds <torvalds@osdl.org> |
||
|---|---|---|
| .. | ||
| 4xx | ||
| 8xx | ||
| 83xx | ||
| 85xx | ||
| apus | ||
| cell | ||
| chrp | ||
| embedded6xx | ||
| iseries | ||
| maple | ||
| powermac | ||
| prep | ||
| pseries | ||
| Makefile | ||