From: Linus Torvalds 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-Url: https://git.stricted.de/?a=commitdiff_plain;h=bf7cf6ee1bd00679bbe93b6ae73f80032759b8df;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.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