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

[Stephen Rothwell <sfr@canb.auug.org.au>]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/input/tablet/acecad.c between commits
2ef2ed597669f5e120d0c51c295f00e34b2f0801 ("Input: acecad - fix incorrect
size parameter in usb_buffer_free") and
5492f6f801c81c9663417cd8e48e759775977c83 ("Input: acecad - simplify
usb_acecad_disconnect()") from the input tree and commit
3cc96f50329227fbf34de2459491901b6ee1c98c ("USB: rename usb_buffer_alloc()
and usb_buffer_free() users") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/input/tablet/acecad.c
index 37d0539,c047016..0000000
--- a/drivers/input/tablet/acecad.c
+++ b/drivers/input/tablet/acecad.c
@@@ -246,11 -252,13 +246,11 @@@ static void usb_acecad_disconnect(struc
  	struct usb_acecad *acecad = usb_get_intfdata(intf);
  
  	usb_set_intfdata(intf, NULL);
 -	if (acecad) {
 -		usb_kill_urb(acecad->irq);
 -		input_unregister_device(acecad->input);
 -		usb_free_urb(acecad->irq);
 -		usb_free_coherent(interface_to_usbdev(intf), 10, acecad->data, acecad->data_dma);
 -		kfree(acecad);
 -	}
 +
 +	input_unregister_device(acecad->input);
 +	usb_free_urb(acecad->irq);
- 	usb_buffer_free(acecad->usbdev, 8, acecad->data, acecad->data_dma);
++	usb_free_coherent(acecad->usbdev, 8, acecad->data, acecad->data_dma);
 +	kfree(acecad);
  }
  
  static struct usb_device_id usb_acecad_id_table [] = {