Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 20 Apr 2006 14:58:58 +0000 (07:58 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 20 Apr 2006 14:58:58 +0000 (07:58 -0700)
commitbf7cf6ee1bd00679bbe93b6ae73f80032759b8df
tree765c7e4ee581badf9e7230025b91ca43172695fd
parent0b699e36b2d43c1b4288992683e5913d347b5b78
parent2784f40e2774b61d68d232bcf92a9484e99f22b8
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: __NR_sys_splice --> __NR_splice