Merge branch 'master' of git://git.denx.de/u-boot-mips
authorWolfgang Denk <wd@denx.de>
Thu, 21 Jan 2010 21:03:28 +0000 (22:03 +0100)
committerWolfgang Denk <wd@denx.de>
Thu, 21 Jan 2010 21:03:28 +0000 (22:03 +0100)
commit7114596a7d27798878f1d7170c2199bf88ba8418
tree47bec7221ceef6eb60db2ee1a149f50a2b7e1430
parentd98acd729f5cc77064396ba817c5bb90fc691a9b
parent19c292999732996e071caa0782eeef0ce0a60ac0
Merge branch 'master' of git://git.denx.de/u-boot-mips