diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-05-20 10:21:48 +1000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-05-20 10:21:48 +1000 |
commit | c534bbe5634bcc84cab0665fe8961df2c220aeec (patch) | |
tree | f2eae06abf1153c17dfd996f96dfe8a35851e9dc /tools/perf/scripts/python/netdev-times.py | |
parent | 965b5608f7da181923d766b83ead06cbdc7dd4b3 (diff) | |
parent | 8050936caf125fbe54111ba5e696b68a360556ba (diff) |
Merge branch 'merge' into next
Merge "merge" branch to get two fairly important bug fixes:
powerpc/powernv: Reset root port in firmware
powerpc: irq work racing with timer interrupt can result in timer interrupt
Diffstat (limited to 'tools/perf/scripts/python/netdev-times.py')
0 files changed, 0 insertions, 0 deletions