diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-03-11 00:20:15 (GMT) |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-03-11 00:20:15 (GMT) |
| commit | d8c0282f4da6d5335fee56141ca92284026f4818 (patch) | |
| tree | 264153c2762ef1682cc685700139b6948bbeb1f6 /fs/timerfd.c | |
| parent | 58bffb5bbb238d56e8818acb463cce990021fa32 (diff) | |
| parent | 8c50b72a3b4f1f7cdfdfebd233b1cbd121262e65 (diff) | |
| download | linux-d8c0282f4da6d5335fee56141ca92284026f4818.tar.xz | |
Merge branch 'topic/mprofile-kernel' into next
Merge the ftrace changes to support -mprofile-kernel on ppc64le. This is
a prerequisite for live patching, the support for which will be merged
via the livepatch tree based on this topic branch.
Diffstat (limited to 'fs/timerfd.c')
0 files changed, 0 insertions, 0 deletions