Merge branch 'next'
authorWolfgang Denk <wd@denx.de>
Thu, 1 Apr 2010 09:28:32 +0000 (11:28 +0200)
committerWolfgang Denk <wd@denx.de>
Thu, 1 Apr 2010 09:28:32 +0000 (11:28 +0200)
commitffa37fc98d71ef930bccd4e9eed37f6ce6b4d6af
tree206908754219b5cc6e9f03518d34fb95a247bef9
parentca6e1c136ddb720c3bb2cc043b99f7f06bc46c55
parentfd03ea89641d6f6ade6d1a8580c1bb9f52b8542c
Merge branch 'next'
Makefile
common/cmd_bootm.c