projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitdc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5
tree1926c96f145965c393a2c8ab523c327dd1a241cftree | snapshot
parentc8f2efc8f636506e0f0c2ba4035382076875f0c1commit | diff
parent9d23108df359e572a0dca0b631bfee9f5e0fa9eacommit | diff
Merge branch 'master' into usb-next

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>
drivers/usb/host/ehci-fsl.c diff1 | diff2 | blob | history
John Crispins staging tree