]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - glsdk/glsdk-u-boot.git/commitdiff
Merge branch 'master' of git://git.denx.de/u-boot-blackfin
authorWolfgang Denk <wd@denx.de>
Mon, 17 Oct 2011 19:50:52 +0000 (21:50 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 17 Oct 2011 19:50:52 +0000 (21:50 +0200)
* '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


Trivial merge