| commit | 66b0835e2bb3d345f060a47bb8c8f883bd25ec2b | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@suse.de> | Thu Feb 17 09:56:40 2011 -0800 |
| committer | Greg Kroah-Hartman <gregkh@suse.de> | Thu Feb 17 09:56:55 2011 -0800 |
| tree | d1fc390dfa58f131df908267d87ef99d4522a596 | |
| parent | 479b46b5599b1e610630d7332e168c1f9c4ee0b4 [diff] | |
| parent | 85e2efbb1db9a18d218006706d6e4fbeb0216213 [diff] |
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>