Merge branch 'master' of git://git.denx.de/u-boot-nios
authorWolfgang Denk <wd@denx.de>
Tue, 1 Dec 2009 09:15:22 +0000 (10:15 +0100)
committerWolfgang Denk <wd@denx.de>
Tue, 1 Dec 2009 09:15:22 +0000 (10:15 +0100)
commit21c76b56a4221d054aaa6ae983c965ceb7894b7c
treeb9fb40a62cb3933210e0a5675783960deaf8370e
parent824d82997fbcf28e49081d36fdd5d3be1b92b03d
parent0a7691e820e33b23f61c6ea0ef6fa72099d1a6ae
Merge branch 'master' of git://git.denx.de/u-boot-nios