Merge branch 'locking/urgent'
authorPeter Zijlstra <peterz@infradead.org>
Fri, 6 Mar 2020 10:06:17 +0000 (11:06 +0100)
committerPeter Zijlstra <peterz@infradead.org>
Fri, 6 Mar 2020 10:06:17 +0000 (11:06 +0100)

Trivial merge