]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'x86/asm'
authorIngo Molnar <mingo@kernel.org>
Thu, 22 May 2014 11:56:33 +0000 (13:56 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 22 May 2014 11:56:33 +0000 (13:56 +0200)
commit950b4541b0300f9f8088212375c6389b3bac62d8
tree449df5ef95c45b83754358147fac298c025b049e
parent4873023fa5a04e8716acdd04d68fcd9996248272
parent577ed45ec56e9c43269df1c4a05c59ed19ea8e6a
Merge branch 'x86/asm'

Conflicts:
arch/x86/kernel/entry_64.S
arch/x86/kernel/entry_64.S