diff options
author | Linus Torvalds | 2006-07-29 04:24:38 +0200 |
---|---|---|
committer | Linus Torvalds | 2006-07-29 04:24:38 +0200 |
commit | 9d22e6d7ad50472da399a500bf039e7718a6cdc9 (patch) | |
tree | e3b69a31ca755d33ec86e52bbac5e883c59d6daf /block/deadline-iosched.c | |
parent | Merge git://oss.sgi.com:8090/nathans/xfs-rc-2.6 (diff) | |
parent | [SUNLANCE]: fix compilation on sparc-UP (diff) | |
download | kernel-qcow2-linux-9d22e6d7ad50472da399a500bf039e7718a6cdc9.tar.gz kernel-qcow2-linux-9d22e6d7ad50472da399a500bf039e7718a6cdc9.tar.xz kernel-qcow2-linux-9d22e6d7ad50472da399a500bf039e7718a6cdc9.zip |
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 'block/deadline-iosched.c')
0 files changed, 0 insertions, 0 deletions