diff options
| author | Huang, Tao <huangtao@rock-chips.com> | 2015-12-15 09:56:33 +0800 |
|---|---|---|
| committer | Huang, Tao <huangtao@rock-chips.com> | 2015-12-15 09:56:33 +0800 |
| commit | e9ff4433b0a8ca4454cb89f1e6dfa7f95e8769a1 (patch) | |
| tree | 2e3381d5a8b6779f9bb424e93f7ec4cf1f7fc81c /lib | |
| parent | db494ff749971d517ada6a7cb7bde71739efcd6c (diff) | |
| parent | 9f9499ae8e6415cefc4fe0a96ad0e27864353c89 (diff) | |
Merge tag 'v4.4-rc5'
Linux 4.4-rc5
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: * |