]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'linus'
authorIngo Molnar <mingo@kernel.org>
Thu, 23 Aug 2012 08:46:31 +0000 (10:46 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 23 Aug 2012 08:46:31 +0000 (10:46 +0200)

Trivial merge