Conflicts:
	arch/arm/mach-tegra/include/mach/system.h
	arch/arm/mach-tegra/include/mach/usb_phy.h
	arch/arm/mach-tegra/usb_phy.c
	drivers/usb/host/ehci-tegra.c
	drivers/video/tegra/dc/dc.c
	drivers/video/tegra/dc/hdmi.c
	include/linux/tegra_usb.h

Change-Id: Ic1f4f2b360893e8de6b867a8ecc239aca02367da

Add generic access ops for controllers with a ulpi viewport register
(e.g. Chipidea based controller).

Change-Id: I53d50857d4716f8df708af199ad1def1ff9d4beb
Signed-off-by: Benoit Goby <benoit@android.com>

Change-Id: I846d43b1ecbe6c726f024b6a0fb318d6300a3746
Signed-off-by: Benoit Goby <benoit@android.com>

This driver supports devices conforming to the Communication Device
Class (CDC) Network Control Model. The CDC specifications are
available from <http://www.usb.org/>. This driver is implemented as
a minidriver for usbnet driver framework.
Bug 776360

Change-Id: If5e900f80edebc742536a59716aad546b714ba4c
Reviewed-on: http://git-master/r/14921
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>

The original commit went upstream, this is to fix a merge issue from a
slightly different version coming back.

Change-Id: I69a58a483e58a0ee1a13521a466709f5cad6505f
Reviewed-on: http://git-master/r/19663
Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
Tested-by: Daniel Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Robert Morell <rmorell@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>

Conflicts:
	drivers/usb/host/ehci-tegra.c
	include/linux/usb.h
	include/linux/usb/hcd.h

Change-Id: I2499459b717e36a2a994af9d7a5ae1ecb5e7ca9c

Based on the list of enabled USB functions, we can now switch the vendor ID
as well as the product ID.

Signed-off-by: Mike Lockwood <lockwood@android.com>

Provide optional hooks for the host controller driver to override the
default DMA mapping and unmapping routines.  In general, these shouldn't
be necessary unless the host controller has special DMA requirements,
such as alignment contraints.  If these are not specified, the
general usb_hcd_(un)?map_urb_for_dma functions will be used instead.
Also, pass the status to unmap_urb_for_dma so it can know whether the
DMA buffer has been overwritten.

Finally, add a flag to be used by these implementations if they
allocated a temporary buffer so it can be freed properly when unmapping.

Signed-off-by: Robert Morell <rmorell@nvidia.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>