Merge commit 'tip/perfcounters-for-linus' into oprofile/master
authorRobert Richter <robert.richter@amd.com>
Fri, 12 Jun 2009 15:58:48 +0000 (17:58 +0200)
committerRobert Richter <robert.richter@amd.com>
Fri, 12 Jun 2009 15:58:48 +0000 (17:58 +0200)
commit1241eb8f136bf3ea409f61590e7663465906d158
treec8384237f19bb1094d9c90825a74e28393b60d00
parent51563a0e5650d0d76539625388d72d62b34c726e
parent940010c5a314a7bd9b498593bc6ba1718ac5aec5
Merge commit 'tip/perfcounters-for-linus' into oprofile/master

Conflicts:
arch/x86/oprofile/op_model_ppro.c

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