Module Name: src
Committed By: matt
Date: Thu Dec 6 17:57:25 UTC 2012
Modified Files:
src/sys/arch/arm/include [matt-nb6-plus]: isa_machdep.h
src/sys/arch/shark/conf [matt-nb6-plus]: std.shark
src/sys/arch/shark/include [matt-nb6-plus]: vmparam.h
src/sys/arch/shark/isa [matt-nb6-plus]: isa_irq.S isadma_machdep.c
src/sys/arch/shark/ofw [matt-nb6-plus]: ofw.c
src/sys/arch/shark/shark [matt-nb6-plus]: autoconf.c shark_machdep.c
Log Message:
Merge changes from -current.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.10.1 src/sys/arch/arm/include/isa_machdep.h
cvs rdiff -u -r1.8 -r1.8.52.1 src/sys/arch/shark/conf/std.shark
cvs rdiff -u -r1.17 -r1.17.16.1 src/sys/arch/shark/include/vmparam.h
cvs rdiff -u -r1.13 -r1.13.16.1 src/sys/arch/shark/isa/isa_irq.S
cvs rdiff -u -r1.16 -r1.16.4.1 src/sys/arch/shark/isa/isadma_machdep.c
cvs rdiff -u -r1.57 -r1.57.6.1 src/sys/arch/shark/ofw/ofw.c
cvs rdiff -u -r1.17.18.1 -r1.17.18.1.2.1 src/sys/arch/shark/shark/autoconf.c
cvs rdiff -u -r1.39 -r1.39.10.1 src/sys/arch/shark/shark/shark_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
