From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 25 Jan 2013 20:41:02 +0000 (-0800)
Subject: Merge 3.8-rc5 into usb-next
X-Git-Tag: v3.9-rc1~126^2~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67635d397a643514fdfa859f611b86bd3ad8958d;p=pandora-kernel.git

Merge 3.8-rc5 into usb-next

This fixes up a conflict with drivers/usb/serial/io_ti.c that came up in
linux-next.

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

67635d397a643514fdfa859f611b86bd3ad8958d
Reading git-diff-tree failed