aboutsummaryrefslogtreecommitdiff
path: root/arch/m68k/mvme147/config.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-07-28 19:24:38 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-28 19:24:38 -0700
commit9d22e6d7ad50472da399a500bf039e7718a6cdc9 (patch)
treee3b69a31ca755d33ec86e52bbac5e883c59d6daf /arch/m68k/mvme147/config.c
parent159099dc3d501f8a39a169125c476f9b25182610 (diff)
parent93853fd0d492524e9172297d8e8b8364dc2c4c59 (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.
Diffstat (limited to 'arch/m68k/mvme147/config.c')
0 files changed, 0 insertions, 0 deletions