diff --git a/[refs] b/[refs] index 8220284b5c73..326fd5f99438 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8fc16a825eb7780db71268a8502fb3e6af95753 +refs/heads/master: 755727b7fb1e0ebe46824159107749cf635d43b1 diff --git a/trunk/CREDITS b/trunk/CREDITS index 948e0fb9a70e..78163cb3eb6a 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -953,11 +953,11 @@ S: Blacksburg, Virginia 24061 S: USA N: Randy Dunlap -E: rdunlap@xenotime.net -W: http://www.xenotime.net/linux/linux.html -W: http://www.linux-usb.org +E: rdunlap@infradead.org +W: http://www.infradead.org/~rdunlap/ D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers D: x86 SMP, ACPI, bootflag hacking +D: documentation, builds S: (ask for current address) S: USA diff --git a/trunk/Documentation/SubmittingPatches b/trunk/Documentation/SubmittingPatches index c379a2a6949f..aa0c1e63f050 100644 --- a/trunk/Documentation/SubmittingPatches +++ b/trunk/Documentation/SubmittingPatches @@ -60,8 +60,7 @@ own source tree. For example: "dontdiff" is a list of files which are generated by the kernel during the build process, and should be ignored in any diff(1)-generated patch. The "dontdiff" file is included in the kernel tree in -2.6.12 and later. For earlier kernel versions, you can get it -from . +2.6.12 and later. Make sure your patch does not include any extra files which do not belong in a patch submission. Make sure to review your patch -after- diff --git a/trunk/Documentation/printk-formats.txt b/trunk/Documentation/printk-formats.txt index e8a6aa473bab..6e953564de03 100644 --- a/trunk/Documentation/printk-formats.txt +++ b/trunk/Documentation/printk-formats.txt @@ -170,5 +170,5 @@ Reminder: sizeof() result is of type size_t. Thank you for your cooperation and attention. -By Randy Dunlap and +By Randy Dunlap and Andrew Murray