From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 28 Mar 2013 18:00:55 +0000 (-0700)
Subject: Merge branch 'usb-linus' into usb-next
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~135^2~114
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02d5f0857bc2962625fa2d34957d43a9e3175eb4;p=pandora-kernel.git

Merge branch 'usb-linus' into usb-next

This lets us fix the build error that happens when these two trees are merged
together.

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

02d5f0857bc2962625fa2d34957d43a9e3175eb4
Reading git-diff-tree failed