From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 15 Jan 2008 16:07:03 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.24-rc8~6
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8234b65afa92215ae0ed965811ac20c8b3a1806a;p=linux-2.6

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Fix build with SPARSEMEM_VMEMMAP disabled.
  [SPARC]: Make gettimeofday() monotonic again.
---

8234b65afa92215ae0ed965811ac20c8b3a1806a