]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: __NR_sys_splice --> __NR_splice


Trivial merge