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)
commit939e3428066962b7c5966d8f9648058e644f5395
tree3718307b41dbc9428f618e6b2c3f10ba42877c75
parentbfea13d4a127aab4c10085b6f9b6e2ff4f023f79
parent03983ab858ae6aea273060277c9b290498340047
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix sched_clock() et al.