Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)
  USB: remove unused usb_buffer_alloc and usb_buffer_free macros
  usb: musb: update gfp/slab.h includes
  USB: ftdi_sio: fix legacy SIO-device header
  USB: kl5usb105: reimplement using generic framework
  USB: kl5usb105: minor clean ups
  USB: kl5usb105: fix memory leak
  USB: io_ti: use kfifo to implement write buffering
  USB: io_ti: remove unsused private counter
  USB: ti_usb: use kfifo to implement write buffering
  USB: ir-usb: fix incorrect write-buffer length
  USB: aircable: fix incorrect write-buffer length
  USB: safe_serial: straighten out read processing
  USB: safe_serial: reimplement read using generic framework
  USB: safe_serial: reimplement write using generic framework
  usb-storage: always print quirks
  USB: usb-storage: trivial debug improvements
  USB: oti6858: use port write fifo
  USB: oti6858: use kfifo to implement write buffering
  USB: cypress_m8: use kfifo to implement write buffering
  USB: cypress_m8: remove unused drain define
  ...

Fix up conflicts (due to usb_buffer_alloc/free renaming) in
	drivers/input/tablet/acecad.c
	drivers/input/tablet/kbtab.c
	drivers/input/tablet/wacom_sys.c
	drivers/media/video/gspca/gspca.c
	sound/usb/usbaudio.c

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c
index d2f0ee29737f..7cfccfd1b870 100644
--- a/drivers/media/video/hdpvr/hdpvr-video.c
+++ b/drivers/media/video/hdpvr/hdpvr-video.c
@@ -92,8 +92,8 @@ static int hdpvr_free_queue(struct list_head *q)
                 buf = list_entry(p, struct hdpvr_buffer, buff_list);
 
                 urb = buf->urb;
-                usb_buffer_free(urb->dev, urb->transfer_buffer_length,
-                                urb->transfer_buffer, urb->transfer_dma);
+                usb_free_coherent(urb->dev, urb->transfer_buffer_length,
+                                  urb->transfer_buffer, urb->transfer_dma);
                 usb_free_urb(urb);
                 tmp = p->next;
                 list_del(p);
@@ -143,8 +143,8 @@ int hdpvr_alloc_buffers(struct hdpvr_device *dev, uint count)
                 }
                 buf->urb = urb;
 
-                mem = usb_buffer_alloc(dev->udev, dev->bulk_in_size, GFP_KERNEL,
-                                       &urb->transfer_dma);
+                mem = usb_alloc_coherent(dev->udev, dev->bulk_in_size, GFP_KERNEL,
+                                         &urb->transfer_dma);
                 if (!mem) {
                         v4l2_err(&dev->v4l2_dev,
                                  "cannot allocate usb transfer buffer\n");