Commit df0c6ea8 authored Jun 10, 2015 by Greg Kroah-Hartman

Merge tag 'usb-ci-v4.2-rc1' of...

Merge tag 'usb-ci-v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-work

Peter writes:

USB Chipidea update for v4.2-rc1

Just a minor change for code style

parents fc6b68ba aa90e990

drivers/usb/chipidea/usbmisc_imx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ static int usbmisc_imx27_init(struct imx_usbmisc_data *data)
		break;
		default:
		return -EINVAL;
		};
		}

		spin_lock_irqsave(&usbmisc->lock, flags);
		if (data->disable_oc)

Admin message