summaryrefslogtreecommitdiffstats
path: root/drivers/idle
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-07-30 21:11:36 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2016-07-30 21:11:36 +0200
commit7f7d556496a025e5334d52df9e1ebe3674cda22a (patch)
tree8381f6643367fa6ca26a0f9f6325baca155a9a12 /drivers/idle
parentMerge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff)
parentMerge tag 'perf-urgent-for-mingo-20160728' of git://git.kernel.org/pub/scm/li... (diff)
downloadlinux-7f7d556496a025e5334d52df9e1ebe3674cda22a.tar.xz
linux-7f7d556496a025e5334d52df9e1ebe3674cda22a.zip
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Thomas Gleixner: "This update contains: - a fix for the bpf tools to use the new EM_BPF code - a fix for the module parser of perf to retrieve the proper text start address - add str_error_c to libapi to avoid linking against tools/lib/str_error_r.o" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: tools lib api: Add str_error_c to libapi perf s390: Fix 'start' address of module's map tools lib bpf: Use official ELF e_machine value
Diffstat (limited to 'drivers/idle')
0 files changed, 0 insertions, 0 deletions