diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-28 16:32:12 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-28 16:41:26 -0400 |
| commit | cc53963bdd6efb3a4e81f6fbf8f4b2c3894f8b98 (patch) | |
| tree | 4273e96f2c4963cf40276992d225ee689446511d /drivers/usb | |
| parent | f302d2ec52bfb0d9ae2bb7fbff957f3f6ea71f45 (diff) | |
| parent | 39bcea7549c1e3d275262d8062dc2b33e0a99ce8 (diff) | |
Merge branch 'old_linaro-2.6.38' into linaro-2.6.38
Tie the new universe and the time-warped old universe together.
To avoid seeing the old universe when doing log and stat operations,
simply do the following to patch out references to the old branch:
git replace 39bcea7549 f302d2ec52
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'drivers/usb')
0 files changed, 0 insertions, 0 deletions