From: Felipe Balbi Date: Mon, 8 Sep 2014 19:39:01 +0000 (-0500) Subject: Merge tag 'v3.17-rc4' into next X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f7cc38b16e2741186253be3dff61a9d124112126;p=linux-beck.git Merge tag 'v3.17-rc4' into next Merge Linux 3.17-rc4 here so we have all the latest fixes on next too. This also cleans up a few conflicts when applying patches. Signed-off-by: Felipe Balbi Conflicts: drivers/usb/gadget/Makefile drivers/usb/gadget/function/Makefile drivers/usb/gadget/legacy/Makefile drivers/usb/phy/phy-samsung-usb.h --- f7cc38b16e2741186253be3dff61a9d124112126