From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 23 Sep 2013 20:24:10 +0000 (-0700)
Subject: Merge branch 'master' into usb-next
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~66^2~178
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5;p=pandora-kernel.git

Merge branch 'master' into usb-next

We have USB fixes now in Linus's tree that we need to properly sort out
with reverts and the like in the usb-next branch, so merge them together
and do it by hand.

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

dc4fea795bf7e3f80dbfa3a40b8ab89427e9aed5
Reading git-diff-tree failed