From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 17 Sep 2012 03:42:46 +0000 (-0700)
Subject: Merge 3.6-rc6 into usb-next
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~73^2~70
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bcb132c693566bcb8208cc7ce66b72a4f852ecf;p=pandora-kernel.git

Merge 3.6-rc6 into usb-next

This resolves the merge problems with:
	drivers/usb/dwc3/gadget.c
	drivers/usb/musb/tusb6010.c
that had been seen in linux-next.

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

2bcb132c693566bcb8208cc7ce66b72a4f852ecf
Reading git-diff-tree failed