diff options
| author | Robert Richter <robert.richter@amd.com> | 2009-07-14 17:20:44 +0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2009-07-14 17:20:44 +0400 |
| commit | debc6a6927dcd833a30750b07a4c2b456b71f1be (patch) | |
| tree | edd16582c57409e75172e5a397e371d4da88f5fc /drivers/oprofile | |
| parent | 21e70878215f620fe99ea7d7c74bc641aeec932f (diff) | |
| parent | 6847e154e3cd74fca6084124c097980a7634285a (diff) | |
| parent | 4f6e1fe1d8ba3d9f4fb52dd006da9714d75243cf (diff) | |
| download | linux-debc6a6927dcd833a30750b07a4c2b456b71f1be.tar.xz | |
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>