linux-next: manual merge of the usb tree with the trivial tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/gadget/rndis.c between commit
7f26b3a7533bbc1ddd88b297c935ee4da8f74cea ("drivers/usb: Remove
unnecessary return's from void functions") from the trivial tree and
commit c8feb3bad134f927a624cc19da13f57627b905e2 ("USB: gadget: rndis: fix
up coding style issues in the file") from the usb tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/usb/gadget/rndis.c
index 33a9475,6a7dd91..0000000
--- a/drivers/usb/gadget/rndis.c
+++ b/drivers/usb/gadget/rndis.c
@@@ -914,12 -912,14 +912,12 @@@ int rndis_register(void (*resp_avail)(v
  	return -ENODEV;
  }
  
- void rndis_deregister (int configNr)
+ void rndis_deregister(int configNr)
  {
- 	pr_debug("%s: \n", __func__);
+ 	pr_debug("%s:\n", __func__);
  
  	if (configNr >= RNDIS_MAX_CONFIGS) return;
- 	rndis_per_dev_params [configNr].used = 0;
+ 	rndis_per_dev_params[configNr].used = 0;
 -
 -	return;
  }
  
  int rndis_set_param_dev(u8 configNr, struct net_device *dev, u16 *cdc_filter)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/