]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'locking/core'
authorIngo Molnar <mingo@kernel.org>
Thu, 19 Jun 2014 17:38:20 +0000 (19:38 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 19 Jun 2014 17:38:20 +0000 (19:38 +0200)

Trivial merge