]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'x86/asm'
authorIngo Molnar <mingo@kernel.org>
Wed, 19 Sep 2012 15:26:47 +0000 (17:26 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 19 Sep 2012 15:26:47 +0000 (17:26 +0200)

Trivial merge