| commit | 32c15bb978c0e6ff65b3012a6af5a14c899005ce | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Thu, 18 Oct 2007 21:51:02 +0000 (18 14:51 -0700) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Thu, 18 Oct 2007 21:51:02 +0000 (18 14:51 -0700) | ||
| tree | 29b40c7dc083a1f0e3fb199963e88bb73c8b6ea7 | treesnapshot (tar.gz zip) |
| parent | 53253383fde9e41bc07ad4d99f1c8b537fef71d6 | commitdiff |
| parent | 42f77542f4a1c104bb6fbba2e18e04e84415a96b | commitdiff |
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] time: Move R4000 clockevent device code to separate configurable file
[MIPS] time: Delete dead cycles_per_jiffy, mips_timer_ack and null_timer_ack
[MIPS] IP32: Retire use of plat_timer_setup.
[MIPS] Jazz: Retire use of plat_timer_setup.
[MIPS] IP27: Convert to clock_event_device.
[MIPS] JMR3927: Convert to clock_event_device.
[MIPS] Always do the ARC64_TWIDDLE_PC thing.
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] time: Move R4000 clockevent device code to separate configurable file
[MIPS] time: Delete dead cycles_per_jiffy, mips_timer_ack and null_timer_ack
[MIPS] IP32: Retire use of plat_timer_setup.
[MIPS] Jazz: Retire use of plat_timer_setup.
[MIPS] IP27: Convert to clock_event_device.
[MIPS] JMR3927: Convert to clock_event_device.
[MIPS] Always do the ARC64_TWIDDLE_PC thing.