diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-02-21 21:36:40 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-02-21 21:37:09 +0100 |
| commit | d97a860c4f3de98ba5040a22f305b7159fe17cff (patch) | |
| tree | 90c2155ec5a1f3115a9eb7a86f25d1a4610227c6 /tools/perf/scripts/python/event_analyzing_sample.py | |
| parent | cpuidle/pseries: Fix fallout caused due to cleanup in pseries cpuidle backend... (diff) | |
| parent | Merge tag 'pci-v3.14-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-d97a860c4f3de98ba5040a22f305b7159fe17cff.tar.gz linux-d97a860c4f3de98ba5040a22f305b7159fe17cff.zip | |
Merge branch 'linus' into sched/core
Reason: Bring bakc upstream modification to resolve conflicts
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'tools/perf/scripts/python/event_analyzing_sample.py')
0 files changed, 0 insertions, 0 deletions