Merge branch 'master' of git://git.denx.de/u-boot-blackfin
authorWolfgang Denk <wd@denx.de>
Fri, 29 Oct 2010 19:46:08 +0000 (21:46 +0200)
committerWolfgang Denk <wd@denx.de>
Fri, 29 Oct 2010 19:46:08 +0000 (21:46 +0200)
commit3388db2cd72d85717596158131b3e48efe2acfea
tree590ca2d8a11329d6a5ccdfcb6324877fa7c8ee4a
parent1ecb758341bac03994ed045821f9c0f7d1686d07
parent73520939b41d90c0925d5ea4abaa670b7fce2285
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
arch/blackfin/include/asm/config.h