summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-15 08:07:03 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-15 08:07:03 -0800
commit8234b65afa92215ae0ed965811ac20c8b3a1806a (patch)
tree68b14dbbe0dadc81d4f3d6dec0ab675bf48e4994 /include
parent612166c76d6bd1ccd2624a15586a92444d2c4c0e (diff)
parentbf4a7972d638741bbb0672653c1fa10e4480c385 (diff)
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.
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions