From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 8 Jun 2015 17:57:51 +0000 (-0700)
Subject: Merge 4.1-rc7 into usb-next
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~90^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19915e623458004547c1c2490b09bb923fe69337;p=pandora-kernel.git

Merge 4.1-rc7 into usb-next

This resolves a merge issue in musb_core.c and we want the fixes that
were in Linus's tree in this branch as well for testing.

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

19915e623458004547c1c2490b09bb923fe69337
Reading git-diff-tree failed