Google Git
Sign in
third-party-mirror/u-boot/e59af4b611408adcdfb5e19bc5194a7d1f8b4dc3
commit
e59af4b611408adcdfb5e19bc5194a7d1f8b4dc3
[log]
author
Wolfgang Denk <wd@denx.de>
Mon Apr 07 23:59:10 2008 +0200
committer
Wolfgang Denk <wd@denx.de>
Mon Apr 07 23:59:10 2008 +0200
tree
e700a523f54c5ed18bf15f832158f90a31517c85
parent
23c5189e6c969255f8c91b30fdf1cf81b698329d [diff]
parent
70431e8a7393b6b793f77957f95b999fc9a269b8 [diff]
Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

Conflicts:

	lib_ppc/board.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
tree: e700a523f54c5ed18bf15f832158f90a31517c85
  1. api/
  2. api_examples/
  3. board/
  4. common/
  5. cpu/
  6. disk/
  7. doc/
  8. drivers/
  9. examples/
  10. fs/
  11. include/
  12. lib_arm/
  13. lib_avr32/
  14. lib_blackfin/
  15. lib_generic/
  16. lib_i386/
  17. lib_m68k/
  18. lib_microblaze/
  19. lib_mips/
  20. lib_nios/
  21. lib_nios2/
  22. lib_ppc/
  23. lib_sh/
  24. libfdt/
  25. nand_spl/
  26. net/
  27. onenand_ipl/
  28. post/
  29. tools/
  30. .gitignore
  31. arm_config.mk
  32. avr32_config.mk
  33. blackfin_config.mk
  34. CHANGELOG
  35. CHANGELOG-before-U-Boot-1.1.5
  36. config.mk
  37. COPYING
  38. CREDITS
  39. i386_config.mk
  40. m68k_config.mk
  41. MAINTAINERS
  42. MAKEALL
  43. Makefile
  44. microblaze_config.mk
  45. mips_config.mk
  46. mkconfig
  47. nios2_config.mk
  48. nios_config.mk
  49. ppc_config.mk
  50. README
  51. rules.mk
  52. sh_config.mk