]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'core/locking'
authorIngo Molnar <mingo@kernel.org>
Tue, 30 Jul 2013 19:25:55 +0000 (21:25 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 30 Jul 2013 19:25:55 +0000 (21:25 +0200)

Trivial merge