Tom Rini fbbbc86e8e Merge branch 'master' of git://git.denx.de/u-boot-arm ...

Fix a trivial conflict in arch/arm/dts/exynos5250.dtsi about gpio and
serial.

Conflicts:
	arch/arm/dts/exynos5250.dtsi

Signed-off-by: Tom Rini <trini@ti.com>

2013-07-12 10:36:48 -04:00

..

_ashldi3.S

Move lib_$ARCH directories to arch/$ARCH/lib

2010-04-13 09:13:03 +02:00

_ashrdi3.S

Move lib_$ARCH directories to arch/$ARCH/lib

2010-04-13 09:13:03 +02:00

_divsi3.S

Move lib_$ARCH directories to arch/$ARCH/lib

2010-04-13 09:13:03 +02:00

_lshrdi3.S

Move lib_$ARCH directories to arch/$ARCH/lib

2010-04-13 09:13:03 +02:00

_modsi3.S

Move lib_$ARCH directories to arch/$ARCH/lib

2010-04-13 09:13:03 +02:00

_udivsi3.S

Move lib_$ARCH directories to arch/$ARCH/lib

2010-04-13 09:13:03 +02:00

_umodsi3.S

Move lib_$ARCH directories to arch/$ARCH/lib

2010-04-13 09:13:03 +02:00

board.c

lib: consolidate hang()

2013-05-01 16:41:08 -04:00

bootm-fdt.c

arm: Use image_setup_linux() instead of local code

2013-05-14 15:37:25 -04:00

bootm.c

bootm: Clean up bootz_setup() function

2013-07-10 09:15:14 -04:00

cache-cp15.c

ARM: mmu: Set domain permissions to client access

2013-03-28 09:10:58 +01:00

cache-pl310.c

armv7: cache: remove flush on un-aligned invalidate

2011-09-04 11:36:16 +02:00

cache.c

arm: Remove OMAP2420H4 and all omap24xx support

2013-06-10 08:43:19 -04:00

crt0.S

cosmetic: arm: fix comments in arch/arm/lib/crt0.S

2013-06-10 21:24:22 +02:00

div0.c

Move lib_$ARCH directories to arch/$ARCH/lib

2010-04-13 09:13:03 +02:00

eabi_compat.c

arm: Don't use printf() in SPL builds

2012-07-07 14:07:43 +02:00

interrupts.c

ARM: prevent misaligned array inits

2012-10-15 11:53:07 -07:00

Makefile

arm: generalize lib/bss.c into lib/sections.c

2013-06-21 23:04:43 +02:00

memcpy.S

arm: lib: memcpy: Do not copy to same address

2011-09-03 22:40:45 +02:00

memset.S

arm: Use optimized memcpy and memset from linux

2011-04-27 19:38:07 +02:00

relocate.S

pxa: fix memory coherency problem after relocation

2013-06-22 15:25:28 +02:00

reset.c

Make sure that argv[] argument pointers are not modified.

2010-07-04 23:55:42 +02:00

sections.c

arm: make __rel_dyn_{start, end} compiler-generated

2013-06-21 23:05:29 +02:00

spl.c

Replace __bss_end__ with __bss_end

2013-03-15 16:13:54 -04:00