u-boot/include/usb
Stefano Babic 05a860c228 Merge branch 'master' of git://git.denx.de/u-boot into master
Conflicts:
	drivers/power/power_fsl.c
	include/configs/mx35pdk.h
	include/configs/mx53loco.h
	include/configs/woodburn_common.h
	board/woodburn/woodburn.c

These boards still use the old old PMIC framework, so they
do not merge properly after the power framework was merged into
mainline.

Fix all conflicts and update woodburn to use Power Framework.

Signed-off-by: Stefano Babic <sbabic@denx.de>
2012-12-08 12:02:45 +01:00
..
designware_udc.h USB:gadget:designware Support high speed 2012-03-19 00:08:17 +01:00
ehci-fsl.h ehci-mxc: Make EHCI power/oc polarities configurable 2012-11-16 09:16:45 +01:00
lin_gadget_compat.h usb:gadget:composite USB composite gadget support 2012-05-20 08:32:33 +02:00
mpc8xx_udc.h drivers/usb: regorganisation 2009-04-06 20:40:46 +02:00
musb_udc.h Prepare v2010.03-rc1 2010-03-12 23:06:04 +01:00
mv_udc.h usb: lowlevel interface change to support multiple controllers 2012-10-15 11:54:00 -07:00
omap1510_udc.h drivers/usb: regorganisation 2009-04-06 20:40:46 +02:00
pxa27x_udc.h Support for PXA27X UDC. 2009-04-06 20:40:47 +02:00
s3c_udc.h linux/usb/ch9.h: update with the version from Linux tree 2012-11-20 00:16:06 +01:00
ulpi.h usb: ulpi: add indicator configuration function 2012-10-15 11:54:01 -07:00