From: Felipe Balbi <balbi@ti.com>
Date: Tue, 16 Sep 2014 14:53:59 +0000 (-0500)
Subject: Merge tag 'v3.17-rc5' into next
X-Git-Tag: fixes-for-v3.18-merge-window~16^2~118^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cd41ffd27b6b775445ecfdb72b592b71d6b4a32;p=pandora-kernel.git

Merge tag 'v3.17-rc5' into next

Linux 3.17-rc5

Signed-off-by: Felipe Balbi <balbi@ti.com>

Conflicts:
	Documentation/devicetree/bindings/usb/mxs-phy.txt
	drivers/usb/phy/phy-mxs-usb.c
---

4cd41ffd27b6b775445ecfdb72b592b71d6b4a32
Reading git-diff-tree failed