From 16f98ee49a50d97cb8c356e98f47071736244e24 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Mon, 4 Sep 2006 15:41:16 +0200 Subject: [PATCH] --- yaml --- r: 37591 b: refs/heads/master c: 0fe23479577124bd2687e6783e39fa0fa4c28005 h: refs/heads/master i: 37589: 6ee023d6612feacaedf6b57666151bffa705fe61 37587: 206020359299ff2abade89baef8c639481078c2c 37583: 42c0c8b1bfc6b5abf2819c328785c68a3705dbee v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 8 ++++---- trunk/block/as-iosched.c | 2 +- trunk/block/blktrace.c | 2 +- trunk/block/cfq-iosched.c | 2 +- trunk/block/deadline-iosched.c | 2 +- trunk/block/elevator.c | 2 +- trunk/fs/bio.c | 2 +- trunk/fs/ioprio.c | 2 +- trunk/fs/splice.c | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 25acde941505..7d8efe135151 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50be345560f1ffdcb15cc0e146416b80529a2ef2 +refs/heads/master: 0fe23479577124bd2687e6783e39fa0fa4c28005 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 28e1c7b9244a..f0cd5a3f6de6 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -501,7 +501,7 @@ S: Maintained BLOCK LAYER P: Jens Axboe -M: axboe@suse.de +M: axboe@kernel.dk L: linux-kernel@vger.kernel.org T: git kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git S: Maintained @@ -1380,7 +1380,7 @@ S: Maintained IDE/ATAPI CDROM DRIVER P: Jens Axboe -M: axboe@suse.de +M: axboe@kernel.dk L: linux-kernel@vger.kernel.org W: http://www.kernel.dk S: Maintained @@ -2531,7 +2531,7 @@ S: Maintained SCSI CDROM DRIVER P: Jens Axboe -M: axboe@suse.de +M: axboe@kernel.dk L: linux-scsi@vger.kernel.org W: http://www.kernel.dk S: Maintained @@ -2976,7 +2976,7 @@ S: Maintained UNIFORM CDROM DRIVER P: Jens Axboe -M: axboe@suse.de +M: axboe@kernel.dk L: linux-kernel@vger.kernel.org W: http://www.kernel.dk S: Maintained diff --git a/trunk/block/as-iosched.c b/trunk/block/as-iosched.c index bc13dc0b29be..165509e8659e 100644 --- a/trunk/block/as-iosched.c +++ b/trunk/block/as-iosched.c @@ -1,7 +1,7 @@ /* * Anticipatory & deadline i/o scheduler. * - * Copyright (C) 2002 Jens Axboe + * Copyright (C) 2002 Jens Axboe * Nick Piggin * */ diff --git a/trunk/block/blktrace.c b/trunk/block/blktrace.c index a45e61885037..135593c8e45b 100644 --- a/trunk/block/blktrace.c +++ b/trunk/block/blktrace.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 Jens Axboe + * Copyright (C) 2006 Jens Axboe * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 6dbee46240c5..99116e2a310a 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -4,7 +4,7 @@ * Based on ideas from a previously unfinished io * scheduler (round robin per-process disk scheduling) and Andrea Arcangeli. * - * Copyright (C) 2003 Jens Axboe + * Copyright (C) 2003 Jens Axboe */ #include #include diff --git a/trunk/block/deadline-iosched.c b/trunk/block/deadline-iosched.c index 3b3b4414170e..b7c5b34cb7b4 100644 --- a/trunk/block/deadline-iosched.c +++ b/trunk/block/deadline-iosched.c @@ -1,7 +1,7 @@ /* * Deadline i/o scheduler. * - * Copyright (C) 2002 Jens Axboe + * Copyright (C) 2002 Jens Axboe */ #include #include diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c index e643291793a4..487dd3da8853 100644 --- a/trunk/block/elevator.c +++ b/trunk/block/elevator.c @@ -3,7 +3,7 @@ * * Copyright (C) 2000 Andrea Arcangeli SuSE * - * 30042000 Jens Axboe : + * 30042000 Jens Axboe : * * Split the elevator a bit so that it is possible to choose a different * one or even write a new "plug in". There are three pieces: diff --git a/trunk/fs/bio.c b/trunk/fs/bio.c index 52de79c29942..8f93e939f213 100644 --- a/trunk/fs/bio.c +++ b/trunk/fs/bio.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001 Jens Axboe + * Copyright (C) 2001 Jens Axboe * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as diff --git a/trunk/fs/ioprio.c b/trunk/fs/ioprio.c index 03dc4f269b76..6dc6721d9e82 100644 --- a/trunk/fs/ioprio.c +++ b/trunk/fs/ioprio.c @@ -1,7 +1,7 @@ /* * fs/ioprio.c * - * Copyright (C) 2004 Jens Axboe + * Copyright (C) 2004 Jens Axboe * * Helper functions for setting/querying io priorities of processes. The * system calls closely mimmick getpriority/setpriority, see the man page for diff --git a/trunk/fs/splice.c b/trunk/fs/splice.c index 684bca3d3a10..13e92dd19fbb 100644 --- a/trunk/fs/splice.c +++ b/trunk/fs/splice.c @@ -12,7 +12,7 @@ * Jens to support splicing to files, network, direct splicing, etc and * fixing lots of bugs. * - * Copyright (C) 2005-2006 Jens Axboe + * Copyright (C) 2005-2006 Jens Axboe * Copyright (C) 2005-2006 Linus Torvalds * Copyright (C) 2006 Ingo Molnar *