]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 1 May 2006 15:12:39 +0000 (08:12 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 1 May 2006 15:12:39 +0000 (08:12 -0700)
commit0d262424b07582a3aa3afa85af645bd436a94a39
tree4ec3c7034bb244515904c6866642fdc9a9a4b39a
parent9f29333dae3488542b1344871e8ecb84084ad80e
parentc9f2946fbec88d4baa3a6d47eb3a8e6b08b05cd9
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:
  [SPARC64]: Disable preemption during flush_tlb_pending().
  [SPARC64]: Kill __flush_tlb_page() prototype.