Albert ARIBAUD a19b0dd62d Merge branch 'u-boot/master' into 'u-boot-arm/master' ... Conflicts: common/cmd_fpga.c drivers/usb/host/ohci-at91.c		2013-05-30 14:45:06 +02:00
..
efikamx-usb.c	imx: mx51_efikamx/sb: Convert to iomux-v3	2013-05-05 17:55:04 +02:00
efikamx.c	imx: iomux-mx51: Fix MX51_PAD_EIM_CS2__GPIO2_27	2013-05-05 17:55:04 +02:00
imximage_mx.cfg	Fix references to the documentation files	2013-05-10 08:16:33 -04:00
imximage_sb.cfg	Fix references to the documentation files	2013-05-10 08:16:33 -04:00
Makefile	efikamx: refine USB support	2012-09-04 12:06:44 +02:00