From: Michael R Sweet <michaelrsweet@gmail.com>
Date: Thu, 24 Mar 2016 21:30:24 +0000 (-0400)
Subject: Mirror fix from master.
X-Git-Tag: release-2.1.4~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60f4a67a67d2c28b7416ee4d9eb31da0515fed52;p=thirdparty%2Fcups.git

Mirror fix from master.
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 28d9fb27a1..4a15956225 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,7 @@ CHANGES IN CUPS V2.1.4
 	- The cups-lpd mini-daemon incorrectly included the document-name
 	  attribute when creating a job.  It should only be included when
 	  sending a job (Issue #4790)
-	- USB quirk updates (Issue #4789)
+	- USB quirk updates (Issue #4778, Issue #4789)
 	- Documentation update (Issue #4772)
 
 
diff --git a/backend/org.cups.usb-quirks b/backend/org.cups.usb-quirks
index 9503f28c1b..5368f18a8b 100644
--- a/backend/org.cups.usb-quirks
+++ b/backend/org.cups.usb-quirks
@@ -244,3 +244,6 @@
 
 # Xerox WorkCentre 3220 (https://bugs.launchpad.net/bugs/1406203, Issue #4789)
 0x0924 0x4294 no-reattach
+
+# Lexmark C540n (Issue #4778)
+0x043d 0x0139 no-reattach