Stefan Roese f2302d4430 Fix merge problems ...

Signed-off-by: Stefan Roese <sr@denx.de>

2008-08-06 14:05:38 +02:00

..

arch-arm720t

Big white-space cleanup.

2008-05-21 00:14:08 +02:00

arch-arm925t

Patches by Kshitij, 04 Jul 2003

2003-07-15 20:04:06 +00:00

arch-arm926ejs

* Patch by George G. Davis, 19 Aug 2003:

2003-08-29 22:00:43 +00:00

arch-at91rm9200

Fix merge problems

2008-08-06 14:05:38 +02:00

arch-at91sam9

Move definition of container_of() to common.h

2008-06-03 20:27:23 +02:00

arch-davinci

Revert merge of git://www.denx.de/git/u-boot-arm, commit 62479b18:

2008-04-11 15:11:26 +02:00

arch-imx

arm-imx: Fix register definitions

2008-03-02 21:15:06 +01:00

arch-ixp

Big white-space cleanup.

2008-05-21 00:14:08 +02:00

arch-ks8695

* Patch by Greg Ungerer, 19 May 2005:

2005-05-19 22:39:42 +00:00

arch-lpc2292

Add the files for the SMN42 board

2007-05-09 11:41:58 +01:00

arch-mx31

mx31ads: fix 32kHz clock handling

2008-05-10 00:21:43 +02:00

arch-omap

Update omap5912osk board support

2006-05-10 10:55:16 +02:00

arch-omap24xx

Big white-space cleanup.

2008-05-21 00:14:08 +02:00

arch-pxa

MMC: Consolidate MMC/SD command definitions

2008-06-28 22:40:15 +02:00

arch-s3c24x0

Big white-space cleanup.

2008-05-21 00:14:08 +02:00

arch-s3c44b0

* Patch by Andrea Scian, 17 Feb 2004:

2004-02-24 00:16:43 +00:00

arch-sa1100

Big white-space cleanup.

2008-05-21 00:14:08 +02:00

proc-armv

* Code cleanup:

2003-06-27 21:31:46 +00:00

atomic.h

* Header file cleanup for ARM

2003-06-25 22:26:29 +00:00

bitops.h

* Code cleanup:

2003-06-27 21:31:46 +00:00

byteorder.h

* Code cleanup:

2003-06-27 21:31:46 +00:00

dma-mapping.h

Fix @ -> <at> substitution

2008-05-10 00:30:22 +02:00

errno.h

* Fix CONFIG_NET_MULTI support in include/net.h

2003-06-15 22:40:42 +00:00

global_data.h

Change bd/gd memsize/ram_size to be phys_size_t.

2008-06-12 00:54:53 +02:00

hardware.h

* Header file cleanup for ARM

2003-06-25 22:26:29 +00:00

io.h

Fix misspelled comment

2008-05-04 00:01:08 +02:00

mach-types.h

ARM: Add support for Lyrtech SFF-SDR board (ARM926EJS)

2008-06-28 22:54:21 +02:00

memory.h

* Header file cleanup for ARM

2003-06-25 22:26:29 +00:00

posix_types.h

Initial revision

2002-08-14 13:28:45 +00:00

processor.h

* Header file cleanup for ARM

2003-06-25 22:26:29 +00:00

ptrace.h

* Code cleanup:

2003-06-27 21:31:46 +00:00

setup.h

* Code cleanup:

2003-06-27 21:31:46 +00:00

sizes.h

* Header file cleanup for ARM

2003-06-25 22:26:29 +00:00

string.h

* Patch by Daniel Engström, 18 Nov 2002:

2002-11-19 23:01:07 +00:00

types.h

Introduce phys_size_t and move phys_addr_t into asm/types.h

2008-04-13 17:13:46 -07:00

u-boot-arm.h

Make setenv() return status

2008-07-01 23:03:14 +02:00

u-boot.h

Big white-space cleanup.

2008-05-21 00:14:08 +02:00