diff --git a/[refs] b/[refs] index af6651f33d7f..cbd44dc4de0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 +refs/heads/master: 6e57559022a2c6e3decfb77a228f8a354ac23ba1 diff --git a/trunk/Documentation/block/biodoc.txt b/trunk/Documentation/block/biodoc.txt index 508b5b2b0289..b9a83dd24732 100644 --- a/trunk/Documentation/block/biodoc.txt +++ b/trunk/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 + Nick Piggin Introduction: diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 88ec0447a4f3..1e5f23381618 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4731,7 +4731,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/ivd/rt2x00.git F: drivers/net/wireless/rt2x00/ RAMDISK RAM BLOCK DEVICE DRIVER -M: Nick Piggin +M: Nick Piggin S: Maintained F: Documentation/blockdev/ramdisk.txt F: drivers/block/brd.c