Google Git
Sign in
third-party-mirror/u-boot/f8edca2e9a128f526b1fe6f997f7adb852cf5b3c
commit
f8edca2e9a128f526b1fe6f997f7adb852cf5b3c
[log]
author
Kumar Gala <galak@kernel.crashing.org>
Mon Mar 20 10:42:05 2006 -0600
committer
Kumar Gala <galak@kernel.crashing.org>
Mon Mar 20 10:42:05 2006 -0600
tree
92deb9ddf1153c64ff1ced9392816e60b4ecaa03
parent
79582020313e6d992a3bac71cf3a9b337f9ac7f7 [diff]
parent
7b4fd36b0322ec98836a8459d9be80e2777fdc05 [diff]
Merge branch 'origin'

Conflicts:

	CHANGELOG
tree: 92deb9ddf1153c64ff1ced9392816e60b4ecaa03
  1. board/
  2. common/
  3. cpu/
  4. disk/
  5. doc/
  6. drivers/
  7. dtt/
  8. examples/
  9. fs/
  10. include/
  11. lib_arm/
  12. lib_blackfin/
  13. lib_generic/
  14. lib_i386/
  15. lib_m68k/
  16. lib_microblaze/
  17. lib_mips/
  18. lib_nios/
  19. lib_nios2/
  20. lib_ppc/
  21. net/
  22. post/
  23. rtc/
  24. tools/
  25. arm_config.mk
  26. blackfin_config.mk
  27. CHANGELOG
  28. config.mk
  29. COPYING
  30. CREDITS
  31. i386_config.mk
  32. m68k_config.mk
  33. MAINTAINERS
  34. MAKEALL
  35. Makefile
  36. microblaze_config.mk
  37. mips_config.mk
  38. mkconfig
  39. nios2_config.mk
  40. nios_config.mk
  41. ppc_config.mk
  42. README