commit | 0a4908e19fd016d60403fc76cf38b2d08d21e2d2 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Oct 19 12:01:22 2007 -0700 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri Oct 19 12:01:22 2007 -0700 |
tree | f8f33a474bfb9835625677c76735fb27fe0a2b75 | |
parent | 2843483d2eb02ad104edbe8b2429fb6a39d25063 [diff] | |
parent | 6f75aaa72af19d3e4d144e13d59e71f51686b77f [diff] |
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.