diff options
author | 2016-01-10 07:53:55 -0800 | |
---|---|---|
committer | 2016-01-10 07:53:55 -0800 | |
commit | 8b63b6bfc1a551acf154061699028c7032d7890c (patch) | |
tree | 16882e9bc9e35eacb870a6d8a71617e579c4ffdc /kernel/locking/lockdep.c | |
parent | libnvdimm: fix namespace object confusion in is_uuid_busy() (diff) | |
parent | block: kill disk_{check|set|clear|alloc}_badblocks (diff) | |
download | linux-dev-8b63b6bfc1a551acf154061699028c7032d7890c.tar.xz linux-dev-8b63b6bfc1a551acf154061699028c7032d7890c.zip |
Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm
Diffstat (limited to 'kernel/locking/lockdep.c')
-rw-r--r-- | kernel/locking/lockdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c index deae3907ac1e..60ace56618f6 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c @@ -6,7 +6,7 @@ * Started by Ingo Molnar: * * Copyright (C) 2006,2007 Red Hat, Inc., Ingo Molnar <mingo@redhat.com> - * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com> + * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra * * this code maps all the lock dependencies as they occur in a live kernel * and will warn about the following classes of locking bugs: |