Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c
index 33d5c579c5ad..6491c9c00c83 100644
--- a/drivers/net/usb/cdc-phonet.c
+++ b/drivers/net/usb/cdc-phonet.c
@@ -372,12 +372,12 @@ int usbpn_probe(struct usb_interface *intf, const struct usb_device_id *id)
         /* Data interface has one inactive and one active setting */
         if (data_intf->num_altsetting != 2)
                 return -EINVAL;
-        if (data_intf->altsetting[0].desc.bNumEndpoints == 0
-         && data_intf->altsetting[1].desc.bNumEndpoints == 2)
+        if (data_intf->altsetting[0].desc.bNumEndpoints == 0 &&
+            data_intf->altsetting[1].desc.bNumEndpoints == 2)
                 data_desc = data_intf->altsetting + 1;
         else
-        if (data_intf->altsetting[0].desc.bNumEndpoints == 2
-         && data_intf->altsetting[1].desc.bNumEndpoints == 0)
+        if (data_intf->altsetting[0].desc.bNumEndpoints == 2 &&
+            data_intf->altsetting[1].desc.bNumEndpoints == 0)
                 data_desc = data_intf->altsetting;
         else
                 return -EINVAL;