aboutsummaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-16 18:46:21 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-16 18:46:21 -0800
commit0c864d8b3e51bd61f43484268c9aa4eb9a199b02 (patch)
treede9fa5c3792c84fa173e6d27c856bde0254f7eeb /firmware
parent4fd24483d1de7a3c183fa862fa9ff13b49361966 (diff)
parentf4a75d2eb7b1e2206094b901be09adb31ba63681 (diff)
downloadvexpress-lsk-0c864d8b3e51bd61f43484268c9aa4eb9a199b02.tar.gz
Merge 3.7-rc6 into usb-next.
This resolves a conflict with these files: drivers/usb/early/ehci-dbgp.c drivers/usb/host/ehci-ls1x.c drivers/usb/host/ohci-xls.c drivers/usb/musb/ux500.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'firmware')
0 files changed, 0 insertions, 0 deletions