]> git.karo-electronics.de Git - karo-tx-linux.git/commit
manual merge of x86/urgent
authorIngo Molnar <mingo@kernel.org>
Sat, 12 Oct 2013 17:19:09 +0000 (19:19 +0200)
committerIngo Molnar <mingo@kernel.org>
Sat, 12 Oct 2013 17:19:09 +0000 (19:19 +0200)
commit775ab4c304e131f999e8e66a1413628e618469ca
tree8a91843cded656a19f0f3edfe2250aea75ed927d
parent793a7a16be82e2e097c2acc01c62c881424eddf9
parent8412da757776727796e9edd64ba94814cc08d536
manual merge of x86/urgent

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/Kconfig
arch/x86/kernel/reboot.c