Merge branch 'linus'
authorIngo Molnar <mingo@kernel.org>
Thu, 26 Sep 2013 18:49:53 +0000 (20:49 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 26 Sep 2013 18:49:53 +0000 (20:49 +0200)
commit474a83b76f6bde8a5f8f8e39d90181ca85d39f46
treea9f8e2e790b74de50d85469ec79fb1c841c3da90
parent16c21ae5ca636cfd38e581ebcf709c49d78ea56d
parent654fdd041227d7de1594baa61c58f2c87bd0640f
Merge branch 'linus'

Merge in the relevant upstream merge point to queue up dependent patch.

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