diff options
| author |   Robert Richter <robert.richter@amd.com> | 2010-10-25 16:58:34 +0200 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-25 16:58:34 +0200 |
| commit | 4cafc4b8d7219b70e15f22e4a51b3ce847810caf (patch) | |
| tree | 8051ea3f36f0682d08f47df8e35e14ca7eb7a5d7 /fs/jbd2/commit.c | |
| parent | oprofile, x86: Add support for IBS periodic op counter extension (diff) | |
| parent | Merge commit 'linux-2.6/master' (early part) into oprofile/core (diff) | |
| download | linux-dev-4cafc4b8d7219b70e15f22e4a51b3ce847810caf.tar.xz linux-dev-4cafc4b8d7219b70e15f22e4a51b3ce847810caf.zip | |
Merge branch 'oprofile/core' into oprofile/x86
Conflicts:
arch/x86/oprofile/op_model_amd.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions