apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream' into for-linus

Browse Source 
Conflicts:
	drivers/hid/usbhid/hid-quirks.c
This commit is contained in:
Jiri Kosina
2012-10-01 14:37:51 +02:00
parent fa2bd30159 86e6b77eb7
commit a3cbe10e47
31 changed files with 112 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/hid/hid-wacom.c
-1
View File
@@ -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>
* Copyright (c) 2006 Andrew Zabolotny <zap@homelink.ru>
* Copyright (c) 2009 Bastien Nocera <hadess@hadess.net>