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
..
2011-07-25 23:40:11 +02:00
2013-03-25 09:56:07 -07:00
2013-04-01 16:33:52 -04:00
2013-03-19 08:45:36 -07:00
2013-03-25 09:56:07 -07:00