Merge branch 'master' of git://git.denx.de/u-boot-imx
authorWolfgang Denk <wd@denx.de>
Sun, 17 Oct 2010 17:57:38 +0000 (19:57 +0200)
committerWolfgang Denk <wd@denx.de>
Sun, 17 Oct 2010 17:57:38 +0000 (19:57 +0200)
1  2 
include/configs/qong.h

Simple merge