Wolfgang Denk f82642e338 Merge 'next' branch ...

Conflicts:

	board/freescale/mpc8536ds/mpc8536ds.c
	include/configs/mgcoge.h

Signed-off-by: Wolfgang Denk <wd@denx.de>

2008-10-18 21:59:44 +02:00

..

bios_emulator

Fix the function conflict in x86emu when DEBUG is on

2008-10-17 01:14:37 +02:00

block

rename CFG_ macros to CONFIG_SYS

2008-10-18 21:54:03 +02:00

dma

drivers/dma: Move conditional compilation to Makefile

2008-08-13 01:40:39 +02:00

hwmon

rename CFG_ macros to CONFIG_SYS

2008-10-18 21:54:03 +02:00

i2c

mgsuvd: fix compiler warning when using soft_i2c driver

2008-10-18 21:54:04 +02:00

input

rename CFG_ macros to CONFIG_SYS

2008-10-18 21:54:03 +02:00

misc

fsl_law clear enable before changing.

2008-10-18 21:54:05 +02:00

mmc

rename CFG_ macros to CONFIG_SYS

2008-10-18 21:54:03 +02:00

mtd

rename CFG_ macros to CONFIG_SYS

2008-10-18 21:54:03 +02:00

net

Merge 'next' branch

2008-10-18 21:59:44 +02:00

pci

rename CFG_ macros to CONFIG_SYS

2008-10-18 21:54:03 +02:00

pcmcia

rename CFG_ macros to CONFIG_SYS

2008-10-18 21:54:03 +02:00

qe

rename CFG_ macros to CONFIG_SYS

2008-10-18 21:54:03 +02:00

rtc

rename CFG_ macros to CONFIG_SYS

2008-10-18 21:54:03 +02:00

serial

rename CFG_ macros to CONFIG_SYS

2008-10-18 21:54:03 +02:00

spi

rename CFG_ macros to CONFIG_SYS

2008-10-18 21:54:03 +02:00

usb

rename CFG_ macros to CONFIG_SYS

2008-10-18 21:54:03 +02:00

video

rename CFG_ macros to CONFIG_SYS

2008-10-18 21:54:03 +02:00