tree 29b40c7dc083a1f0e3fb199963e88bb73c8b6ea7
parent 53253383fde9e41bc07ad4d99f1c8b537fef71d6
parent 42f77542f4a1c104bb6fbba2e18e04e84415a96b
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1192744262 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1192744262 -0700

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] 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.