Wolfgang Denk 5f6db68b42 Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx ... * 'master' of git://git.denx.de/u-boot-mpc85xx: powerpc/85xx: don't touch MAS7 on e500v1 when relocating CCSR powerpc/85xx: don't display address map size (32-bit vs. 36-bit) during boot cmd_bdinfo: display the address map size (32-bit vs. 36-bit) PowerPC: correct the SATA for p1/p2 rdb-pc platform powerpc/corenet_ds: Slave core in holdoff when boot from SRIO powerpc/corenet_ds: Slave reads ENV from master when boot from SRIO powerpc/corenet_ds: Slave uploads ucode when boot from SRIO powerpc/corenet_ds: Slave module for boot from SRIO powerpc/corenet_ds: Master module for boot from SRIO powerpc/corenet_ds: Document for the boot from SRIO powerpc/corenet_ds: Correct the compilation errors about ENV powerpc/srio: Rewrite the struct ccsr_rio powerpc/85xx:Fix lds for nand boot debug info powerpc/p2041rdb: add env in NAND support powerpc/p2041rdb: add NAND and NAND boot support powerpc/mpc8xxx: Fix CONFIG_DDR_RAW_TIMING for two boards powerpc/85xx:Avoid vector table compilation for nand_spl powerpc/85xx:Fix IVORs addr after vector table relocation powerpc/85xx:Avoid hardcoded vector address for IVORs powerpc/p1023rds: Disable nor flash node and enable nand flash node		2012-04-30 16:45:56 +02:00
..
arm	Merge branch 'master' of git://git.denx.de/u-boot-i2c	2012-04-30 16:43:49 +02:00
avr32	bootstage: Replace show_boot_progress/error() with bootstage_...()	2012-03-18 21:41:39 +01:00
blackfin	Blackfin: move gd/bd to bss by default	2012-04-22 13:00:19 -04:00
m68k	bootstage: Replace show_boot_progress/error() with bootstage_...()	2012-03-18 21:41:39 +01:00
microblaze	bootstage: Replace show_boot_progress/error() with bootstage_...()	2012-03-18 21:41:39 +01:00
mips	MIPS: fix endianess handling	2012-04-02 15:54:53 +02:00
nds32	nds32/ag102: add ag102 soc support	2012-04-22 16:58:23 +08:00
nios2	nios2: implement get_ticks and get_tbclk	2012-02-23 08:31:20 +08:00
openrisc	openrisc: Add library functions	2012-01-13 21:16:48 +01:00
powerpc	powerpc/85xx: don't touch MAS7 on e500v1 when relocating CCSR	2012-04-24 23:58:34 -05:00
sandbox	sandbox: Use the new run_command()	2012-04-23 22:53:54 +02:00
sh	Prepare v2012.04-rc2; minor Coding Style cleanup	2012-04-16 23:13:51 +02:00
sparc	usb: replace wait_ms() with mdelay()	2012-03-19 00:08:16 +01:00
x86	sc520: fix build warning about unused temp var	2012-03-06 21:05:18 +11:00
.gitignore	update include/asm/ gitignore after move	2010-05-07 00:17:30 +02:00