summaryrefslogtreecommitdiff
path: root/net/nfc/hci/hci.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/nfc/hci/hci.h')
0 files changed, 0 insertions, 0 deletions
15169b8bf77a1f27ed6d926f82ea59f&id2=31f5260a7653e6042ac28578db1c61e84f2d7898'>diff)
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar: "An Intel PMU driver hotplug fix and three 'perf probe' tooling fixes" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/intel: Handle exclusive threadid correctly on CPU hotplug perf probe: Fix to probe on gcc generated functions in modules perf probe: Add error checks to offline probe post-processing perf probe: Fix to show correct locations for events on modules
Diffstat (limited to 'include')