Tom Rini 0ce033d258 Merge branch 'master' of git://git.denx.de/u-boot-arm ... Albert's rework of the linker scripts conflicted with Simon's making everyone use __bss_end. We also had a minor conflict over README.scrapyard being added to in mainline and enhanced in u-boot-arm/master with proper formatting. Conflicts: arch/arm/cpu/ixp/u-boot.lds arch/arm/cpu/u-boot.lds arch/arm/lib/Makefile board/actux1/u-boot.lds board/actux2/u-boot.lds board/actux3/u-boot.lds board/dvlhost/u-boot.lds board/freescale/mx31ads/u-boot.lds doc/README.scrapyard include/configs/tegra-common.h Build tested for all of ARM and run-time tested on am335x_evm. Signed-off-by: Tom Rini <trini@ti.com>		2013-03-18 14:37:18 -04:00
..
bios_emulator	Add abs() macro to return absolute value	2012-05-15 08:31:37 +02:00
block	mvsata_ide.c: Correction of typo in comments	2013-03-11 17:00:28 -04:00
bootcount	Consolidate bootcount code into drivers/bootcount	2012-09-01 14:26:02 +02:00
dfu	dfu:usb:fix: Read the "filesize" environment variable only when file read	2012-09-21 00:05:00 +02:00
dma	mxs: dma: Fix APBH DMA driver for MX23	2013-01-28 11:43:00 +01:00
fpga	FPGA: Cyclon II: Correctly reset the FPGA before configuration	2012-10-29 14:21:20 -07:00
gpio	Merge u-boot/master into u-boot-ti/master	2013-03-11 12:16:13 -04:00
hwmon	hwmon: do not init sensors on startup	2011-08-04 23:30:38 +02:00
i2c	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-03-18 14:37:18 -04:00
input	ppc: Move mpc5xxx clocks to arch_global_data	2013-02-04 09:05:43 -05:00
misc	Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged	2012-12-19 13:02:36 -08:00
mmc	Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'	2013-03-15 20:50:43 +01:00
mtd	Merge u-boot/master into u-boot-ti/master	2013-03-11 12:16:13 -04:00
net	Merge u-boot/master into u-boot-ti/master	2013-03-11 12:16:13 -04:00
pci	powerpc/p4080ds: fix PCI-e x8 link training down failure	2012-11-27 18:28:07 -06:00
pcmcia	PXA: Remove PXA PCMCIA support	2012-03-26 23:09:23 +02:00
power	Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging	2013-01-14 15:30:31 -07:00
qe	ppc: Move CONFIG_QE to arch_global_data	2013-02-04 09:05:42 -05:00
rtc	ppc: Remove PCIPPC2 and PCIPPC6 boards	2013-03-11 17:00:28 -04:00
serial	Merge branch 'master' of git://git.denx.de/u-boot-arm	2013-03-18 14:37:18 -04:00
sound	Sound: WM8994: Add FDT support to codec	2013-01-08 10:54:33 +09:00
spi	Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'	2013-03-15 15:18:31 +01:00
tpm	Introduce generic TPM support in u-boot	2011-12-07 08:45:51 +01:00
twserial	Switch from archive libraries to partial linking	2010-11-17 21:02:18 +01:00
usb	Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'	2013-03-15 20:50:43 +01:00
video	omap3: allow dynamic selection of gfx_format	2013-03-08 16:41:13 -05:00
watchdog	mx31/mx35/mx51/mx53/mx6: add watchdog	2013-01-13 11:39:57 +01:00