]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'oprofile/core' into oprofile/x86
authorRobert Richter <robert.richter@amd.com>
Mon, 25 Oct 2010 14:58:34 +0000 (16:58 +0200)
committerRobert Richter <robert.richter@amd.com>
Mon, 25 Oct 2010 14:58:34 +0000 (16:58 +0200)
commita77a56aa9e57b18a08ef8f4156a5a985c99768b2
tree8051ea3f36f0682d08f47df8e35e14ca7eb7a5d7
parent5e735011c428c4478d4f38ce978c643a10c6c30b
parent628739cd757d6d900dd31b00a9c3bf644a43fca6
Merge branch 'oprofile/core' into oprofile/x86

Conflicts:
arch/x86/oprofile/op_model_amd.c

Signed-off-by: Robert Richter <robert.richter@amd.com>
arch/x86/oprofile/op_model_amd.c