diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-03-29 22:00:50 -0600 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-30 08:24:46 -0400 |
| commit | 3aad04105485a8eae642fed9e9f06fa7096b6115 (patch) | |
| tree | dfa5dbf9dcb083c36ccce52a4a7a55a0cd99aaa8 /mm | |
| parent | 3e42b0fd76be95391adf49fe68b80641881de57e (diff) | |
USB: fix merge error in isp1760-hcd.c
0e9882b4fb8703f13921279fe4a6592574f92c62
from Merge commit 'v2.6.38.1' into linaro-2.6.38
Signed-off-by: John Rigby <john.rigby@linaro.org>
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions