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

..

api

Generic udelay() with watchdog support

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

standalone

smc91111_eeprom: drop CONFIG stub protection

2009-12-02 23:33:01 +01:00