]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'linus'
authorIngo Molnar <mingo@kernel.org>
Sat, 12 Oct 2013 17:19:12 +0000 (19:19 +0200)
committerIngo Molnar <mingo@kernel.org>
Sat, 12 Oct 2013 17:19:12 +0000 (19:19 +0200)

Trivial merge