Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3cbe10e authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'upstream' into for-linus 

Conflicts:
	drivers/hid/usbhid/hid-quirks.c
parents fa2bd301 86e6b77e

drivers/hid/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -307,7 +307,6 @@ config HID_LOGITECH 
config HID_LOGITECH_DJ

	tristate "Logitech Unifying receivers full support"

	depends on HID_LOGITECH

	default m

	---help---

	Say Y if you want support for Logitech Unifying receivers and devices.

	Unifying receivers are capable of pairing up to 6 Logitech compliant

drivers/hid/hid-a4tech.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
 *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>

 *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc

 *  Copyright (c) 2006-2007 Jiri Kosina

 *  Copyright (c) 2007 Paul Walmsley

 *  Copyright (c) 2008 Jiri Slaby

 */

drivers/hid/hid-apple.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
 *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>

 *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc

 *  Copyright (c) 2006-2007 Jiri Kosina

 *  Copyright (c) 2007 Paul Walmsley

 *  Copyright (c) 2008 Jiri Slaby <jirislaby@gmail.com>

 */

drivers/hid/hid-aureal.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>

 *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc

 *  Copyright (c) 2006-2007 Jiri Kosina

 *  Copyright (c) 2007 Paul Walmsley

 *  Copyright (c) 2008 Jiri Slaby

 */

#include <linux/device.h>

drivers/hid/hid-belkin.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
 *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>

 *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc

 *  Copyright (c) 2006-2007 Jiri Kosina

 *  Copyright (c) 2007 Paul Walmsley

 *  Copyright (c) 2008 Jiri Slaby

 */