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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/btree.c | 2 | ||||
| -rw-r--r-- | lib/proportions.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/btree.c b/lib/btree.c index 4264871ea1a0..f93a945274af 100644 --- a/lib/btree.c +++ b/lib/btree.c @@ -5,7 +5,7 @@ * * Copyright (c) 2007-2008 Joern Engel <joern@logfs.org> * Bits and pieces stolen from Peter Zijlstra's code, which is - * Copyright 2007, Red Hat Inc. Peter Zijlstra <pzijlstr@redhat.com> + * Copyright 2007, Red Hat Inc. Peter Zijlstra * GPLv2 * * see http://programming.kicks-ass.net/kernel-patches/vma_lookup/btree.patch diff --git a/lib/proportions.c b/lib/proportions.c index 6f724298f67a..efa54f259ea9 100644 --- a/lib/proportions.c +++ b/lib/proportions.c @@ -1,7 +1,7 @@ /* * Floating proportions * - * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com> + * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra * * Description: * |