From: Wolfgang Denk Date: Mon, 17 Oct 2011 19:50:52 +0000 (+0200) Subject: Merge branch 'master' of git://git.denx.de/u-boot-blackfin X-Git-Tag: v2011.12-rc1~513 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d639a8ccb0aa3c8c9d4ba0b642951f5534dcbdf1;p=platform%2Fkernel%2Fu-boot.git Merge branch 'master' of git://git.denx.de/u-boot-blackfin * 'master' of git://git.denx.de/u-boot-blackfin: Blackfin: bfin_spi: fix build error when DEBUG is defined Blackfin: define CONFIG_SYS_CACHELINE_SIZE --- d639a8ccb0aa3c8c9d4ba0b642951f5534dcbdf1