projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a6a2da 6b16351)
Merge 3.5-rc4 into usb-linus
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Jun 2012 16:11:02 +0000 (09:11 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Jun 2012 16:12:22 +0000 (09:12 -0700)
This is needed to sync up with the previous USB changes that were merged in
Linus's branch.

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

Trivial merge
John Crispins staging tree