Merge branch 'sglist-arch' into for-linus

[linux-2.6] / Documentation / block / biodoc.txt

diff --git a/Documentation/block/biodoc.txt b/Documentation/block/biodoc.txt
index dc3f49e3e5392891f10d700567363b3446358b67..93f223b9723f8c66d81e92edd290f607d5469c34 100644 (file)
--- a/Documentation/block/biodoc.txt
+++ b/Documentation/block/biodoc.txt
@@ -2,7 +2,7 @@
        =====================================================
 
 Notes Written on Jan 15, 2002:
        =====================================================
 
 Notes Written on Jan 15, 2002:

-       Jens Axboe <axboe@suse.de>
+       Jens Axboe <jens.axboe@oracle.com>

        Suparna Bhattacharya <suparna@in.ibm.com>
 
 Last Updated May 2, 2002
        Suparna Bhattacharya <suparna@in.ibm.com>
 
 Last Updated May 2, 2002


@@ -21,7 +21,7 @@ Credits:
 ---------
 
 2.5 bio rewrite:
 ---------
 
 2.5 bio rewrite:

-       Jens Axboe <axboe@suse.de>
+       Jens Axboe <jens.axboe@oracle.com>

 
 Many aspects of the generic block layer redesign were driven by and evolved
 over discussions, prior patches and the collective experience of several
 
 Many aspects of the generic block layer redesign were driven by and evolved
 over discussions, prior patches and the collective experience of several