Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 4 May 2006 17:25:05 +0000 (13:25 -0400)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 4 May 2006 17:25:05 +0000 (13:25 -0400)
commit0de2a93e80917c70716c20b8b6a75e5350da3f71
treecd729f3c98bc0b343c0f1789890c974236d6960d
parentfed3be9bd56e67c9b9324277b7f95c32e73a75bb
parent8c45112b823972e9ff7bbca77dc592ca2224951b
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Hook up vmsplice into syscall tables.