diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-12-24 08:08:47 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-12-24 08:08:47 +1000 |
| commit | 20f8e032e6dc7053ab803f488e2a8839cd2f69a6 (patch) | |
| tree | 406b662934bffa205d90e9435bf96af7dc1a0cb0 /lib/btree.c | |
| parent | ade1ba7346070709856d7e38f8d1a77b7aa710aa (diff) | |
| parent | 5b726e06d6e8309e5c9ef4109a32caf27c71dfc8 (diff) | |
Backmerge drm-fixes merge into Linus's tree into drm-next.
This merges '5b726e06d6e8309e5c9ef4109a32caf27c71dfc8' into drm-next
Just to resolve some merges to make Daniel's life easier.
Signed-off-by: DAve Airlie <airlied@redhat.com>
Diffstat (limited to 'lib/btree.c')
| -rw-r--r-- | lib/btree.c | 2 |
1 files changed, 1 insertions, 1 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 |