projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c8f2efc 9d23108)
Merge branch 'master' into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Sep 2013 20:24:10 +0000 (13:24 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Sep 2013 20:24:10 +0000 (13:24 -0700)
We have USB fixes now in Linus's tree that we need to properly sort out
with reverts and the like in the usb-next branch, so merge them together
and do it by hand.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/usb/host/ehci-fsl.c patch | diff1 | diff2 | blob | history

diff --cc drivers/usb/host/ehci-fsl.c
Simple merge
John Crispins staging tree