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
..
cpu	Merge branch 'u-boot/master' into 'u-boot-arm/master'	2013-05-30 14:45:06 +02:00
include/asm	Merge branch 'u-boot/master' into 'u-boot-arm/master'	2013-05-30 14:45:06 +02:00
lib	Power: remove support for Freescale MPC8220	2013-05-15 08:41:03 -04:00
config.mk	ppc: Enable generic board support	2013-03-15 16:14:00 -04:00