From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 20 Apr 2006 14:58:58 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.17-rc3~61
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf7cf6ee1bd00679bbe93b6ae73f80032759b8df;p=platform%2Fkernel%2Flinux-3.10.git

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
---

bf7cf6ee1bd00679bbe93b6ae73f80032759b8df