commit | 9d22e6d7ad50472da399a500bf039e7718a6cdc9 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@g5.osdl.org> | Fri Jul 28 19:24:38 2006 -0700 |
committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Jul 28 19:24:38 2006 -0700 |
tree | e3b69a31ca755d33ec86e52bbac5e883c59d6daf | |
parent | 159099dc3d501f8a39a169125c476f9b25182610 [diff] | |
parent | 93853fd0d492524e9172297d8e8b8364dc2c4c59 [diff] |
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.