]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f29333 c9f2946)
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)
* 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.


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.