summaryrefslogtreecommitdiffstats
path: root/kernel/time/timer.c
diff options
context:
space:
mode:
authorLinus Torvalds2015-11-04 06:33:18 +0100
committerLinus Torvalds2015-11-04 06:33:18 +0100
commit66ef3493d4bb387f5a83915e33dc893102fd1b43 (patch)
tree2bd8a29781dce25d610c3bd058c0dd2a4139856f /kernel/time/timer.c
parentMerge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
parentx86/intel-mid: Make intel_mid_ops static (diff)
downloadkernel-qcow2-linux-66ef3493d4bb387f5a83915e33dc893102fd1b43.tar.gz
kernel-qcow2-linux-66ef3493d4bb387f5a83915e33dc893102fd1b43.tar.xz
kernel-qcow2-linux-66ef3493d4bb387f5a83915e33dc893102fd1b43.zip
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform changes from Ingo Molnar: "Misc updates to the Intel MID and SGI UV platforms" * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/intel-mid: Make intel_mid_ops static arch/x86/intel-mid: Use kmemdup rather than duplicating its implementation x86/platform/uv: Implement simple dump failover if kdump fails x86/platform/uv: Insert per_cpu accessor function on uv_hub_nmi
Diffstat (limited to 'kernel/time/timer.c')
0 files changed, 0 insertions, 0 deletions