| commit | 8234b65afa92215ae0ed965811ac20c8b3a1806a | |
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Tue, 15 Jan 2008 16:07:03 +0000 (15 08:07 -0800) | ||
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | |
| Tue, 15 Jan 2008 16:07:03 +0000 (15 08:07 -0800) | ||
| tree | 68b14dbbe0dadc81d4f3d6dec0ab675bf48e4994 | treesnapshot (tar.gz zip) |
| parent | 612166c76d6bd1ccd2624a15586a92444d2c4c0e | commitdiff |
| parent | bf4a7972d638741bbb0672653c1fa10e4480c385 | commitdiff |
Merge git://git./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.
* 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.