diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-01-06 17:31:06 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-01-06 17:31:06 -0800 |
| commit | efbc57c0e6a92083fce03927736f5d389182935b (patch) | |
| tree | 2e900ae80abfd296a6f0c0c3a7e6c1ae95ae2705 /arch/sh/kernel | |
| parent | 4b1af853646ca893fa686701d1605998fffcc82c (diff) | |
| parent | 57c80e8e5d1cddae0651e5314394e6069ebbbe3c (diff) | |
Merge branch 'goodix' into next
Merge several improvements to Goodix touchscreen driver:
- power management support
- configuration upload
- axis swapping and inversion
Diffstat (limited to 'arch/sh/kernel')
| -rw-r--r-- | arch/sh/kernel/perf_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/perf_event.c b/arch/sh/kernel/perf_event.c index 7cfd7f153966..4dca18347ee9 100644 --- a/arch/sh/kernel/perf_event.c +++ b/arch/sh/kernel/perf_event.c @@ -10,7 +10,7 @@ * Copyright (C) 2008-2009 Red Hat, Inc., Ingo Molnar * Copyright (C) 2009 Jaswinder Singh Rajput * Copyright (C) 2009 Advanced Micro Devices, Inc., Robert Richter - * Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com> + * Copyright (C) 2008-2009 Red Hat, Inc., Peter Zijlstra * Copyright (C) 2009 Intel Corporation, <markus.t.metzger@intel.com> * * ppc: |