Conflicts: tools/perf/builtin-top.c Semantic conflict: util/include/linux/list.h # fix prefetch.h removal fallout Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
|---|---|---|
| .. | ||
| firewire | ||
| perf | ||
| power/x86 | ||
| slub | ||
| testing/ktest | ||
| usb | ||
| virtio | ||
Conflicts: tools/perf/builtin-top.c Semantic conflict: util/include/linux/list.h # fix prefetch.h removal fallout Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
|---|---|---|
| .. | ||
| firewire | ||
| perf | ||
| power/x86 | ||
| slub | ||
| testing/ktest | ||
| usb | ||
| virtio | ||