diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-22 17:58:57 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-22 17:58:57 (GMT) |
| commit | a11637194adc8bf2c2022ac89314dbdd1fcd1778 (patch) | |
| tree | b761d38ee683a71b7140b4203aee1cd319c5ef0e /include/linux/ppp_defs.h | |
| parent | 636040b4eddf6152b5d0b2d574663809f898953b (diff) | |
| parent | 6921a575c9f26f7ea274aaea3b78967810ce5513 (diff) | |
| download | linux-fsl-qoriq-a11637194adc8bf2c2022ac89314dbdd1fcd1778.tar.xz | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf updates from Ingo Molnar.
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
ftrace: Make all inline tags also include notrace
perf: Use css_tryget() to avoid propping up css refcount
perf tools: Fix synthesizing tracepoint names from the perf.data headers
perf stat: Fix default output file
perf tools: Fix endianity swapping for adds_features bitmask
Diffstat (limited to 'include/linux/ppp_defs.h')
0 files changed, 0 insertions, 0 deletions