Merge branch 'master' of git://git.denx.de/u-boot-nios
authorWolfgang Denk <wd@denx.de>
Mon, 9 Apr 2012 15:00:45 +0000 (17:00 +0200)
committerWolfgang Denk <wd@denx.de>
Mon, 9 Apr 2012 15:00:45 +0000 (17:00 +0200)
commit5c877b1ae0a4219ed6bd8d32cf3f7106b81ecb3b
treecdcad9a534e5cd03a40c69bd51ab1b84d7092231
parent8ec57a9dc1de46836bf8f81f0911b4bc26e0e6c7
parentbb60db634c26d609b289e114f44cc2c94ee64c4f
Merge branch 'master' of git://git.denx.de/u-boot-nios

* 'master' of git://git.denx.de/u-boot-nios:
  nios2 - adjust gbl data off to account for bd_info
  nios2: implement get_ticks and get_tbclk
  nios2: add flush_dcache_range function