summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-09-01 15:42:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-09-01 15:42:28 -0700
commite713c80a4e49d4bed5324d24755e42bf01c87556 (patch)
tree9afaa8311ba524f5369f432c30034309f15e3e70 /security
parent43af9872f52abfed5523b8346d98a5e283b38163 (diff)
parentc8b5db7de66b75330a96f9f1ad7376b89646c953 (diff)
downloadlinux-e713c80a4e49d4bed5324d24755e42bf01c87556.tar.bz2
Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 clockevent update from Thomas Gleixner: "A single commit, which converts HPET clockevents driver to the new callbacks" * 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/hpet: Migrate to new set_state interface
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions