From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 24 Dec 2013 18:18:03 +0000 (-0800)
Subject: Merge 3.13-rc5 into usb-next
X-Git-Tag: v3.14-rc1~148^2~91
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99f14bd4d1b2a1b1b6cd508e08efdbc5e3919198;p=pandora-kernel.git

Merge 3.13-rc5 into usb-next

This resolves the merge issue with drivers/usb/host/ohci-at91.c

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

99f14bd4d1b2a1b1b6cd508e08efdbc5e3919198
Reading git-diff-tree failed