From: Greg Kroah-Hartman Date: Thu, 1 May 2014 23:26:24 +0000 (-0700) Subject: Merge tag 'fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4dd7aa0f3c8ade14da682311cdc0e1298226763e;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge tag 'fixes-for-v3.15-rc4' of git://git./linux/kernel/git/balbi/usb into usb-linus Felipe writes: usb: fixes for v3.15-rc4 Small pull request this time containing only 3 patches. One patch is fixing at91 resource retrieval, one fixes a conditional in the generic OTG FSM and another fixes a state transition also on our generic OTG FSM. Signed-of-by: Felipe Balbi --- 4dd7aa0f3c8ade14da682311cdc0e1298226763e