From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 13 Jun 2012 22:22:54 +0000 (-0700)
Subject: Merge branch 'usb-linus' into usb-next
X-Git-Tag: v3.6-rc1~101^2~53^2~58
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e17f8af316525c2a795bb314dfcc23201fb51ef4;p=pandora-kernel.git

Merge branch 'usb-linus' into usb-next

This is to pick up the changes to the option driver, which are needed
for follow-on patches from Johan.

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

e17f8af316525c2a795bb314dfcc23201fb51ef4
Reading git-diff-tree failed