Merge tag 'fixes-for-v3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 May 2014 23:26:24 +0000 (16:26 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 1 May 2014 23:26:24 +0000 (16:26 -0700)
commit4dd7aa0f3c8ade14da682311cdc0e1298226763e
tree1f16100dfa1d39bc0b206ad1486dc9e40934cb0e
parentd1db0eea852497762cab43b905b879dfcd3b8987
parent886c7c426d465732ec9d1b2bbdda5642fc2e7e05
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 <balbi@ti.com>