]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'linus'
authorIngo Molnar <mingo@kernel.org>
Tue, 21 Aug 2012 08:35:34 +0000 (10:35 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 21 Aug 2012 08:35:34 +0000 (10:35 +0200)

Trivial merge