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

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in:

  drivers/usb/host/fusbh200-hcd.c

between commit:

  34e51ba6b65b ("usb-host: Remove fusbh200 driver")

from the usb tree and patch:

   "dma: remove external references to dma_supported"

from the akpm tree.

I fixed it up (the former removed the file, so I did that) and can carry
the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
--
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/