git.stricted.de - GitHub/LineageOS/android_kernel_motorola

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Thu, 5 Jul 2012 15:57:24 +0000 (08:57 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Thu, 5 Jul 2012 15:58:03 +0000 (08:58 -0700)
commit	e765bf84d59257d3c4f948fbce426ea3565e83ad
tree	e6c2fa13b21a2faf398c3c6ceba8fe5187e381d7	tree \| snapshot (tar.gz zip)
parent	afd6bb387323154ff6554b52d333ec6efb8efe61	commit \| diff
parent	6887a4131da3adaab011613776d865f4bcfb5678	commit \| diff

Merge 3.5-rc5 into usb-next

This resolves a merge issue with the option.c USB serial driver.

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