diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-10-15 10:45:00 (GMT) |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-15 10:45:00 (GMT) |
| commit | 6268464b370e234e0255330190f9bd5d19386ad7 (patch) | |
| tree | 5742641092ce64227dd2086d78baaede57da1f80 /drivers/net/qlge | |
| parent | 7df01d96b295e400167e78061b81d4c91630b12d (diff) | |
| parent | 0fdf13606b67f830559abdaad15980c7f4f05ec4 (diff) | |
| download | linux-fsl-qoriq-6268464b370e234e0255330190f9bd5d19386ad7.tar.xz | |
Merge remote branch 'tip/perf/core' into oprofile/core
Conflicts:
arch/arm/oprofile/common.c
kernel/perf_event.c
Diffstat (limited to 'drivers/net/qlge')
0 files changed, 0 insertions, 0 deletions