diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 14:37:51 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 14:37:51 +0200 |
| commit | a3cbe10e474ac8c2c30a151a7812e15e4cfa2775 (patch) | |
| tree | f245dd77a3dede97a80f8369d984334b56220752 /drivers/hid/hid-sunplus.c | |
| parent | fa2bd30159499f441125495ba8d9d57f646ea42a (diff) | |
| parent | 86e6b77eb7cf9ca2e9c7092b4dfd588f0a3307b6 (diff) | |
| download | linux-a3cbe10e474ac8c2c30a151a7812e15e4cfa2775.tar.bz2 | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'drivers/hid/hid-sunplus.c')
| -rw-r--r-- | drivers/hid/hid-sunplus.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hid/hid-sunplus.c b/drivers/hid/hid-sunplus.c index d484a0043dd4..45b4b066a262 100644 --- a/drivers/hid/hid-sunplus.c +++ b/drivers/hid/hid-sunplus.c @@ -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 */ |