summaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-07-14 10:37:48 +0200
committerIngo Molnar <mingo@kernel.org>2016-07-14 10:37:48 +0200
commitcefef3a76287c9b51e946d312aea1637bb3a57ff (patch)
treeacc1ee1a6a530803951e3c0a0ca65c08a567f563 /include/asm-generic
parent92d21ac74a9e3c09b0b01c764e530657e4c85c49 (diff)
parent748c7201e622d1c24abb4f85072d2e74d12f295f (diff)
downloadlinux-cefef3a76287c9b51e946d312aea1637bb3a57ff.tar.gz
linux-cefef3a76287c9b51e946d312aea1637bb3a57ff.tar.bz2
linux-cefef3a76287c9b51e946d312aea1637bb3a57ff.zip
Merge branch 'sched/core' into timers/nohz, to avoid conflicts in upcoming patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/asm-generic')
0 files changed, 0 insertions, 0 deletions