diff options
| author | Robert Richter | 2010-10-15 12:45:00 +0200 |
|---|---|---|
| committer | Robert Richter | 2010-10-15 12:45:00 +0200 |
| commit | 6268464b370e234e0255330190f9bd5d19386ad7 (patch) | |
| tree | 5742641092ce64227dd2086d78baaede57da1f80 /drivers/scsi | |
| parent | oprofile: disable write access to oprofilefs while profiler is running (diff) | |
| parent | Merge branch 'tip/perf/recordmcount-2' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| download | kernel-qcow2-linux-6268464b370e234e0255330190f9bd5d19386ad7.tar.gz kernel-qcow2-linux-6268464b370e234e0255330190f9bd5d19386ad7.tar.xz kernel-qcow2-linux-6268464b370e234e0255330190f9bd5d19386ad7.zip | |
Merge remote branch 'tip/perf/core' into oprofile/core
Conflicts:
arch/arm/oprofile/common.c
kernel/perf_event.c
Diffstat (limited to 'drivers/scsi')
0 files changed, 0 insertions, 0 deletions