git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a276400 0b84704)
Merge branch 'usb-linus' into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Jun 2012 22:22:54 +0000 (15:22 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Jun 2012 22:22:54 +0000 (15:22 -0700)
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>

Trivial merge
Pandora Kernel Repository