Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 18 May 2007 15:25:28 +0000 (08:25 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 18 May 2007 15:25:28 +0000 (08:25 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix sched_clock() et al.


Trivial merge