diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 18:56:40 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 18:56:55 +0100 |
| commit | 66b0835e2bb3d345f060a47bb8c8f883bd25ec2b (patch) | |
| tree | d1fc390dfa58f131df908267d87ef99d4522a596 /tools/perf/Documentation/perf-diff.txt | |
| parent | Revert "USB host: Move AMD PLL quirk to pci-quirks.c" (diff) | |
| parent | Linux 2.6.38-rc5 (diff) | |
| download | linux-66b0835e2bb3d345f060a47bb8c8f883bd25ec2b.tar.xz linux-66b0835e2bb3d345f060a47bb8c8f883bd25ec2b.zip | |
Merge 2.6.38-rc5 into usb-next
This is needed to resolve some merge conflicts that were found
in the USB host controller patches, and reported by Stephen Rothwell.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'tools/perf/Documentation/perf-diff.txt')
0 files changed, 0 insertions, 0 deletions