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 /fs/ioctl.c | |
| parent | 9f5974c8734d83d4ab7096ed98136a82f41210d6 (diff) | |
| parent | 624cee31bcb14bfd85559fbec5dd7bb833542965 (diff) | |
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 'fs/ioctl.c')
0 files changed, 0 insertions, 0 deletions