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)
1  2 
arch/blackfin/include/asm/config.h

Simple merge