]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'linus'
authorIngo Molnar <mingo@kernel.org>
Sun, 26 Aug 2012 15:01:00 +0000 (17:01 +0200)
committerIngo Molnar <mingo@kernel.org>
Sun, 26 Aug 2012 15:01:00 +0000 (17:01 +0200)

Trivial merge