diff options
| author | Robert Richter | 2010-04-23 16:47:51 +0200 |
|---|---|---|
| committer | Robert Richter | 2010-04-23 16:47:51 +0200 |
| commit | b971f06187d83b5c03d2b597cccdfef421c0ca91 (patch) | |
| tree | 849dbe485ca9472bea002f94681882ce103fe3cd /MAINTAINERS | |
| parent | oprofile: remove double ring buffering (diff) | |
| parent | Merge branch 'linus' into tracing/core (diff) | |
| download | kernel-qcow2-linux-b971f06187d83b5c03d2b597cccdfef421c0ca91.tar.gz kernel-qcow2-linux-b971f06187d83b5c03d2b597cccdfef421c0ca91.tar.xz kernel-qcow2-linux-b971f06187d83b5c03d2b597cccdfef421c0ca91.zip | |
Merge commit 'tip/tracing/core' into oprofile/core
Conflicts:
drivers/oprofile/cpu_buffer.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions