]> err.no Git - linux-2.6/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Jul 2006 02:24:38 +0000 (19:24 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 29 Jul 2006 02:24:38 +0000 (19:24 -0700)
commit9d22e6d7ad50472da399a500bf039e7718a6cdc9
treee3b69a31ca755d33ec86e52bbac5e883c59d6daf
parent159099dc3d501f8a39a169125c476f9b25182610
parent93853fd0d492524e9172297d8e8b8364dc2c4c59
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:
  [SUNLANCE]: fix compilation on sparc-UP
  [SPARC]: Defer clock_probe to fs_initcall()
  [SPARC64]: Fix typo in pgprot_noncached().
  [SPARC64]: Fix quad-float multiply emulation.