tree 0cf90bde2382fb6480c71a1279887f91b283eea3
parent c829ff2e3d1bec9b2019480d82638149327db99e
parent a2308547d15c0c678a3ce06ac81850f809147142
author Wolfgang Denk <wd@denx.de> 1321909355 +0100
committer Wolfgang Denk <wd@denx.de> 1321909355 +0100

Merge branch 'master' of git://git.denx.de/u-boot-nds32

* 'master' of git://git.denx.de/u-boot-nds32:
  nds32/lib: add ide generic support
  nds32: enhance io.h for compatibility with periphals
  ftide020: fix incorrect information display format