]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'core/locking'
authorIngo Molnar <mingo@kernel.org>
Wed, 25 Apr 2012 10:44:38 +0000 (12:44 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 25 Apr 2012 10:44:38 +0000 (12:44 +0200)

Trivial merge