Wolfgang Denk 9623c158f6 Merge branch 'master' of git://git.denx.de/u-boot-arm ... * 'master' of git://git.denx.de/u-boot-arm: run arm_pci_init after relocation IXP42x PCI rewrite update/fix PDNB3 board update/fix IXDP425 / IXDPG425 boards add dvlhost (dLAN 200 AV Wireless G) board IXP NPE: add support for fixed-speed MII ports update/fix AcTux4 board update/fix AcTux3 board update/fix AcTux2 board update/fix AcTux1 board use -ffunction-sections / --gc-sections on IXP42x support CONFIG_SYS_LDSCRIPT on ARM fix "depend" target in npe directory Fix IXP code to work after relocation was added trigger hardware watchdog in IXP42x serial driver add support for IXP42x Rev. B1 and newer add XScale sub architecture (IXP/PXA) to maintainer list Conflicts: arch/arm/lib/board.c Signed-off-by: Wolfgang Denk <wd@denx.de>		2011-06-23 15:37:33 +02:00
..
arm	Merge branch 'master' of git://git.denx.de/u-boot-arm	2011-06-23 15:37:33 +02:00
avr32	avr32: add ATAG_BOARDINFO	2011-05-18 07:56:54 +02:00
blackfin	Blackfin: use on-chip reset func with newer parts	2011-06-03 13:26:45 -04:00
m68k	Merge branch 'master' of git://git.denx.de/u-boot-arm	2011-04-27 21:48:09 +02:00
microblaze	Make STANDALONE_LOAD_ADDR configurable per board	2011-04-12 22:58:32 +02:00
mips	MIPS: Move timer code to arch/mips/cpu/$(CPU)/	2011-05-10 00:12:31 +09:00
nios2	nios2: Make STANDALONE_LOAD_ADDR configurable per board	2011-05-16 21:00:43 -04:00
powerpc	powerpc/fsl_pci: Fix device tree fixups for newer platforms	2011-05-20 00:48:41 -05:00
sh	Handle most LDSCRIPT setting centrally	2011-04-30 00:59:47 +02:00
sparc	Make STANDALONE_LOAD_ADDR configurable per board	2011-04-12 22:58:32 +02:00
x86	Minor coding style cleanup.	2011-05-19 22:22:44 +02:00
.gitignore	update include/asm/ gitignore after move	2010-05-07 00:17:30 +02:00