Commits
Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core Conflicts: drivers/oprofile/oprofile_stats.c drivers/usb/otg/Kconfig drivers/usb/otg/Makefile Signed-off-by: Robert Richter <robert.richter@amd.com>
Showing diff to4f6e1fe1d8b
Jaswinder Singh Rajput committed 21e70878215x86: oprofile/op_model_amd.c set return values for op_amd_handle_ibs() op_amd_handle_i...
Linus Torvalds committed 6847e154e3cLinux 2.6.31-rc3
Ingo Molnar committed 4f6e1fe1d8bMMerge branch 'auto' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into...