tree 1e4d0e1150b5ae2bea9a5810bec97d18d07644c5
parent 104064b54955addac0fcf9ceb6c68569f2bed6ab
parent e6e0a94573fb33e6e62b848a24864e6864c45464
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1197909782 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1197909782 -0800

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:
  [SPARC32]: Silence sparc32 warnings on missing syscalls.
  [SPARC64]: Fix two kernel linear mapping setup bugs.