diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-04-23 14:12:10 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-04-23 14:12:10 +0200 |
commit | 65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee (patch) | |
tree | 02b22c99008630010f28f45f502f55915f1014c2 /lib/decompress_unlzo.c | |
parent | Merge tag 'perf-core-for-mingo-20160415' of git://git.kernel.org/pub/scm/linu... (diff) | |
parent | perf/core: Make sysctl_perf_cpu_time_max_percent conform to documentation (diff) | |
download | linux-65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee.tar.xz linux-65cbbd037b3d7be0a40bbdb5da9d43b0fccf17ee.zip |
Merge branch 'perf/urgent' into perf/core, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/decompress_unlzo.c')
0 files changed, 0 insertions, 0 deletions