Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Wed, 11 Jun 2008 20:13:07 +0000 (22:13 +0200)
committerWolfgang Denk <wd@denx.de>
Wed, 11 Jun 2008 20:13:07 +0000 (22:13 +0200)
commit1730edf76c54381475e2da11f75b1ce563c4e62c
tree1f2a9fb7a7cd9b547374d9cc3715a7f18001e1ee
parent5ea67393b8b554b8165c38912d753a8df043020d
parentb2815f79288d4da7a3ba18bdbd05120ce09d5622
Merge branch 'master' of git://denx.de/git/u-boot-ppc4xx
board/amcc/taihu/taihu.c
include/asm-ppc/processor.h