summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/sched_clock.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-05-21 15:15:24 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-05-21 15:15:24 +0100
commit4175160b065e74572819a320dcd34129224a4e1c (patch)
tree3298e2c9a7c7db33bf28617875e5429e17eec61c /arch/arm/include/asm/sched_clock.h
parentddf90a2ff2c4a9da99acc898a4afeab3e4251fcd (diff)
parent0ec8e7aa8f63f0cacd545fcd7f40f93fde2c0e6e (diff)
downloadblackbird-op-linux-4175160b065e74572819a320dcd34129224a4e1c.tar.gz
blackbird-op-linux-4175160b065e74572819a320dcd34129224a4e1c.zip
Merge branch 'misc' into for-linus
Conflicts: arch/arm/kernel/ptrace.c
Diffstat (limited to 'arch/arm/include/asm/sched_clock.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud