roy zang 00b574bdc8 Merge branch 'master' into hpc2 ...

Conflicts:

	drivers/Makefile
Fix the merge conflict in file drivers/Makefile
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>

2007-02-28 16:46:48 +08:00

..

5xx_immap.h

* Code cleanup:

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

8xx_immap.h

Patch by Yuli Barcohen, 19 Apr 2004:

2004-06-06 21:35:06 +00:00

atomic.h

…

bitops.h

…

byteorder.h

…

cache.h

…

cpm_85xx.h

…

cpm_8260.h

…

e300.h

mpc83xx: Add MPC8360EMDS basic board support

2006-11-03 19:42:21 -06:00

errno.h

…

fsl_i2c.h

Make fsl-i2c not conflict with SOFT I2C

2006-11-29 00:25:26 -06:00

global_data.h

Fix the confilcts when merging 'master' into hpc2.

2006-12-01 12:09:33 +08:00

immap_83xx.h

Code cleanup.

2006-11-30 18:02:20 +01:00

immap_85xx.h

Use generic I2C register block on 85xx and 86xx.

2006-10-20 17:16:35 -05:00

immap_86xx.h

Use generic I2C register block on 85xx and 86xx.

2006-10-20 17:16:35 -05:00

immap_8220.h

…

immap_8260.h

…

immap_qe.h

mpc83xx: add the QUICC Engine (QE) immap file

2006-11-03 19:42:20 -06:00

io.h

[PATCH v3] Add sync to ensure flash_write_cmd is fully finished

2007-02-21 16:52:31 +01:00

iopin_8xx.h

…

iopin_85xx.h

…

iopin_8260.h

…

m8260_pci.h

…

mc146818rtc.h

…

mmu.h

[PATCH] PPC4xx: Add 440SP(e) DDR2 SPD DIMM support

2007-02-20 10:43:34 +01:00

mpc8349_pci.h

…

pci_io.h

…

pnp.h

…

posix_types.h

…

processor.h

[PATCH] Update 440EPx/440GRx cpu detection

2007-01-31 16:56:10 +01:00

ptrace.h

…

residual.h

…

sigcontext.h

…

signal.h

…

status_led.h

…

string.h

…

types.h

…

u-boot.h

Merge branch 'master' of http://www.denx.de/git/u-boot

2006-09-19 08:51:24 -05:00