diff options
| author | Robert Richter <robert.richter@amd.com> | 2009-07-14 15:20:44 +0200 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2009-07-14 15:20:44 +0200 |
| commit | debc6a6927dcd833a30750b07a4c2b456b71f1be (patch) | |
| tree | edd16582c57409e75172e5a397e371d4da88f5fc /arch/x86/oprofile | |
| parent | x86: oprofile/op_model_amd.c set return values for op_amd_handle_ibs() (diff) | |
| parent | Linux 2.6.31-rc3 (diff) | |
| parent | Merge branch 'auto' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/opr... (diff) | |
| download | linux-debc6a6927dcd833a30750b07a4c2b456b71f1be.tar.xz linux-debc6a6927dcd833a30750b07a4c2b456b71f1be.zip | |
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>