Merge branch 'master' of git://git.denx.de/u-boot-blackfin
authorWolfgang Denk <wd@denx.de>
Mon, 13 Feb 2012 22:13:22 +0000 (23:13 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 13 Feb 2012 22:13:22 +0000 (23:13 +0100)
* 'master' of git://git.denx.de/u-boot-blackfin:
  Blackfin: pata_bfin: fix printf warning
  Blackfin: bfin_nand: mark local func static
  linkage.h: move from blackfin to common includes
  Blackfin: br4: new board port
  Blackfin: add in/out le32 variants
  post: add blackfin to the post_time_ms list
  Blackfin: bf537-stamp: drop board reset workaround
  Blackfin: pr1: new board port

1  2 
MAINTAINERS
boards.cfg

diff --cc MAINTAINERS
Simple merge
diff --cc boards.cfg
Simple merge