Merge branch 'master' into for-next

[firefly-linux-kernel-4.4.55.git] / drivers / usb / class / cdc-acm.c

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 162c95a088ed5efc2a747a1d739a44e30656de01..89d260d6b03194bf95f39f62fe305a6f0268e0f0 100644 (file)
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -2,7 +2,7 @@
  * cdc-acm.c
  *
  * Copyright (c) 1999 Armin Fuerst     <fuerst@in.tum.de>
- * Copyright (c) 1999 Pavel Machek     <pavel@suse.cz>
+ * Copyright (c) 1999 Pavel Machek     <pavel@ucw.cz>
  * Copyright (c) 1999 Johannes Erdfelt <johannes@erdfelt.com>
  * Copyright (c) 2000 Vojtech Pavlik   <vojtech@suse.cz>
  * Copyright (c) 2004 Oliver Neukum    <oliver@neukum.name>