tree a81b9b315127132a84454746043c98990bcd56b9
parent 3482528e9aced9234d4e2a4a9538c882a9aa5aa2
parent 413541dd66d51f791a0b169d9b9014e4f56be13c
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1387909083 -0800
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1387909083 -0800

Merge 3.13-rc5 into usb-next

This resolves the merge issue with drivers/usb/host/ohci-at91.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>