From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 10 Nov 2014 03:10:24 +0000 (+0900)
Subject: Merge 3.18-rc4 into usb-next.
X-Git-Tag: omap-for-v3.19/fixes-rc1~87^2~43
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69b7290e51e558e1e9c1c9ee4d5d31a3809f0f03;p=pandora-kernel.git

Merge 3.18-rc4 into usb-next.

This resolves a conflict in drivers/usb/host/Kconfig

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

69b7290e51e558e1e9c1c9ee4d5d31a3809f0f03
Reading git-diff-tree failed