Merge remote branch 'tip/oprofile' into tip/perf/core
authorRobert Richter <robert.richter@amd.com>
Mon, 1 Mar 2010 10:13:21 +0000 (11:13 +0100)
committerRobert Richter <robert.richter@amd.com>
Mon, 1 Mar 2010 10:22:45 +0000 (11:22 +0100)
Signed-off-by: Robert Richter <robert.richter@amd.com>
1  2 
init/Kconfig

diff --cc init/Kconfig
Simple merge