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

Trivial merge