diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-05 16:23:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-05 16:23:12 -0800 |
| commit | f3969bf78f140f437f51787dfc2751943ba454d1 (patch) | |
| tree | 291ffc7e38d987e8b6fbcbc38dd055818dc34a05 /drivers/net/ethernet/broadcom/tg3.c | |
| parent | Merge tag 'usb-3.3-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb (diff) | |
| parent | Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (diff) | |
| download | linux-dev-f3969bf78f140f437f51787dfc2751943ba454d1.tar.xz linux-dev-f3969bf78f140f437f51787dfc2751943ba454d1.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"It contains three cherry-picked fixes from perf/core, which turned out
to be more urgent than we originally thought."
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf tools: Handle kernels that don't support attr.exclude_{guest,host}
perf tools: Change perf_guest default back to false
perf record: No build id option fails
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
0 files changed, 0 insertions, 0 deletions