summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/tsc.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-03-06 22:51:27 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2016-03-06 22:51:27 +0100
commitdd273a8071124c2235c45d2ca756acc90ca31ed3 (patch)
tree805bb65c17779ce1f16245b56d5e9ccbd7309f27 /arch/x86/include/asm/tsc.h
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag... (diff)
parentARM: 8544/1: set_memory_xx fixes (diff)
downloadlinux-dd273a8071124c2235c45d2ca756acc90ca31ed3.tar.xz
linux-dd273a8071124c2235c45d2ca756acc90ca31ed3.zip
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King: "Just two ARM fixes this time: one to fix the hyp-stub for older ARM CPUs, and another to fix the set_memory_xx() permission functions to deal with zero sizes correctly" * 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: ARM: 8544/1: set_memory_xx fixes ARM: 8534/1: virt: fix hyp-stub build for pre-ARMv7 CPUs
Diffstat (limited to 'arch/x86/include/asm/tsc.h')
0 files changed, 0 insertions, 0 deletions