Wolfgang Denk 2a49bf3149 Merge branch 'master' into next ...

Conflicts:
	board/esd/plu405/plu405.c
	drivers/rtc/ftrtc010.c

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

2009-12-05 02:11:59 +01:00

..

board.c

Nios2: Fix compiler warnings in lib_nios2/board.c (unused variables)

2009-11-23 16:29:40 -05:00

bootm.c

Nios2: do_boom_linux(): kernel gunzip input data integrity problem due to

2009-11-23 16:45:14 -05:00

cache.S

rename CFG_ macros to CONFIG_SYS

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

config.mk

Nios2/Nios: Remove unnecessary (residual) linker Nios command scripts from

2009-11-23 15:54:25 -05:00

divmod.c

…

Makefile

Big white-space cleanup.

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

math.h

Big white-space cleanup.

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

mult.c

rename CFG_ macros to CONFIG_SYS

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

time.c

Generic udelay() with watchdog support

2009-12-05 01:08:53 +01:00