Merge tag 'gpio-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[firefly-linux-kernel-4.4.55.git] / Documentation / applying-patches.txt

diff --git a/Documentation/applying-patches.txt b/Documentation/applying-patches.txt
index a083ba35d1adf8f0b6f676f468a21853be3ddf0e..77df55b0225ab331bb7268592fa5d18ed8f909c7 100644 (file)
--- a/Documentation/applying-patches.txt
+++ b/Documentation/applying-patches.txt
@@ -94,7 +94,7 @@ Common errors when patching
 ---
  When patch applies a patch file it attempts to verify the sanity of the
 file in different ways.
-Checking that the file looks like a valid patch file & checking the code
+Checking that the file looks like a valid patch file and checking the code
 around the bits being modified matches the context provided in the patch are
 just two of the basic sanity checks patch does.