From: Felipe Balbi <balbi@ti.com>
Date: Mon, 8 Sep 2014 19:39:01 +0000 (-0500)
Subject: Merge tag 'v3.17-rc4' into next
X-Git-Tag: fixes-for-v3.18-merge-window~16^2~118^2~29
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7cc38b16e2741186253be3dff61a9d124112126;p=pandora-kernel.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 <balbi@ti.com>

Conflicts:
	drivers/usb/gadget/Makefile
	drivers/usb/gadget/function/Makefile
	drivers/usb/gadget/legacy/Makefile
	drivers/usb/phy/phy-samsung-usb.h
---

f7cc38b16e2741186253be3dff61a9d124112126
Reading git-diff-tree failed