diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-08-17 10:16:12 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-08-17 10:16:12 -0700 |
| commit | 7c52cc1dd1b8930107cce801a161df10b8a34275 (patch) | |
| tree | d088d3d99f4c733526a91d3658056f46ceb7e9c9 /drivers/usb/class | |
| parent | e83e52de655524015d81b3a5def4428704443461 (diff) | |
| parent | 044c31fdf80ed9d8e6bfb33913d085c3efc6febe (diff) | |
Merge branch 'upstream/linaro-3.0' into linaro-android-3.0
Conflicts:
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/mach-origen.c
Diffstat (limited to 'drivers/usb/class')
0 files changed, 0 insertions, 0 deletions