diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-25 08:22:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-25 08:22:49 +0100 |
| commit | 993e5ee67a90c7b6a5dbb61b9c31df2955afff46 (patch) | |
| tree | 76a86f597ad07e908d1d6470d7501ecfacbac4f2 /drivers/net/ethernet/intel/ixgbevf/ethtool.c | |
| parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | perf symbols: Load map before using map->map_ip() (diff) | |
| download | linux-993e5ee67a90c7b6a5dbb61b9c31df2955afff46.tar.xz linux-993e5ee67a90c7b6a5dbb61b9c31df2955afff46.zip | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
* Fix traceevent plugin path definitions (Josh Boyer)
* Load map before using map->map_ip() (Masami Hiramatsu)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbevf/ethtool.c')
0 files changed, 0 insertions, 0 deletions