Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core (debc6a69) · Commits · github.com / kvm-riscv / linux

Commit debc6a69 authored Jul 14, 2009 by

Robert Richter

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>

parents 21e70878 6847e154 4f6e1fe1

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment