Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Dec 2007 16:43:02 +0000 (08:43 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Dec 2007 16:43:02 +0000 (08:43 -0800)
commitde29cba9c9bb2dc35803e8d5c968a454e297b8f3
tree1e4d0e1150b5ae2bea9a5810bec97d18d07644c5
parent104064b54955addac0fcf9ceb6c68569f2bed6ab
parente6e0a94573fb33e6e62b848a24864e6864c45464
Merge git://git./linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC32]: Silence sparc32 warnings on missing syscalls.
  [SPARC64]: Fix two kernel linear mapping setup bugs.