diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 10:21:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 10:21:22 -0800 |
| commit | 45bfe98bd790b5ded00462cd582effcfb42263cc (patch) | |
| tree | d4a1f2c5303dda106635b615f8f40ea9104bf25e /drivers/char/scc.h | |
| parent | Merge git://oss.sgi.com:8090/oss/git/xfs-2.6 (diff) | |
| parent | powerpc: make ARCH=ppc use arch/powerpc/kernel/process.c (diff) | |
| download | linux-dev-45bfe98bd790b5ded00462cd582effcfb42263cc.tar.xz linux-dev-45bfe98bd790b5ded00462cd582effcfb42263cc.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
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>
Diffstat (limited to 'drivers/char/scc.h')
0 files changed, 0 insertions, 0 deletions