diff options
| author | Linus Torvalds <[email protected]> | 2007-10-19 19:01:22 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2007-10-19 19:01:22 +0000 |
| commit | 0a4908e19fd016d60403fc76cf38b2d08d21e2d2 (patch) | |
| tree | f8f33a474bfb9835625677c76735fb27fe0a2b75 /fs/proc/array.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
| parent | [MIPS] Delete totally outdated Documentation/mips/time.README (diff) | |
| download | kernel-0a4908e19fd016d60403fc76cf38b2d08d21e2d2.tar.gz kernel-0a4908e19fd016d60403fc76cf38b2d08d21e2d2.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Delete totally outdated Documentation/mips/time.README
[MIPS] Kill duplicated setup_irq() for cp0 timer
[MIPS] Sibyte: Finish conversion to modern time APIs.
[MIPS] time: Helpers to compute clocksource/event shift and mult values.
[MIPS] SMTC: Build fix.
[MIPS] time: Delete dead code.
[MIPS] MIPSsim: Strip defconfig file to the bones.
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions