From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 2 Apr 2006 19:48:07 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.17-rc1~17
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=23344cb341902f4e3431d8137dca93d6e186d054;p=linux-2.6-omap-h63xx.git

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Wire up sys_sync_file_range() into syscall tables.
  [SPARC]: Wire up sys_splice() into the syscall tables.
  [SPARC64]: Update defconfig.
  [SPARC64]: Align address in huge_pte_alloc().
  [SPARC64]: Document the instruction checks we do in do_sparc64_fault().
  [SPARC64]: Make tsb_sync() mm comparison more precise.
---

23344cb341902f4e3431d8137dca93d6e186d054