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.
Showing
- arch/sparc/kernel/time.c 42 additions, 32 deletionsarch/sparc/kernel/time.c
- drivers/net/sunlance.c 4 additions, 4 deletionsdrivers/net/sunlance.c
- include/asm-sparc64/pgtable.h 1 addition, 1 deletioninclude/asm-sparc64/pgtable.h
- include/asm-sparc64/sfp-machine.h 1 addition, 1 deletioninclude/asm-sparc64/sfp-machine.h
Loading
Please register or sign in to comment