From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 1 May 2006 15:12:39 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.17-rc4~102
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=0d262424b07582a3aa3afa85af645bd436a94a39;p=safe%2Fjmp%2Flinux-2.6

Merge /pub/scm/linux/kernel/git/davem/sparc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Disable preemption during flush_tlb_pending().
  [SPARC64]: Kill __flush_tlb_page() prototype.
---

0d262424b07582a3aa3afa85af645bd436a94a39