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

sh: Remove malloc_bin_reloc from lib_sh, lib_nios2 and lib_nios.

2009-10-30 08:41:15 +09:00

bootm.c

bootm: refactor do_reset and os boot function args

2008-08-26 23:48:01 +02:00

cache.c

* Patch by Scott McNutt, 04 Oct 2003:

2003-10-08 23:26:14 +00:00

config.mk

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

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

divmod.c

* Patch by Scott McNutt, 04 Oct 2003:

2003-10-08 23:26:14 +00:00

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