summaryrefslogtreecommitdiffstats
path: root/Documentation/block/biodoc.txt
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-08-09 15:09:29 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-08-09 15:09:29 +0200
commit054d5c9238f3c577ad51195c3ee7803613f322cc (patch)
treeff7d9f5c0e0ddf14230ba28f28ef69a2c0a0debf /Documentation/block/biodoc.txt
parentMerge branches 'gemini' and 'misc' into devel (diff)
parentMerge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene... (diff)
downloadlinux-054d5c9238f3c577ad51195c3ee7803613f322cc.tar.xz
linux-054d5c9238f3c577ad51195c3ee7803613f322cc.zip
Merge branch 'devel-stable' into devel
Diffstat (limited to 'Documentation/block/biodoc.txt')
-rw-r--r--Documentation/block/biodoc.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
index 508b5b2b0289..b9a83dd24732 100644
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
@@ -7,7 +7,7 @@ Notes Written on Jan 15, 2002:
Last Updated May 2, 2002
September 2003: Updated I/O Scheduler portions
- Nick Piggin <piggin@cyberone.com.au>
+ Nick Piggin <npiggin@kernel.dk>
Introduction: