Google Git
Sign in
third-party-mirror/u-boot/efe33035acd5f7c13963a4d52e5aac1b68612ae4
commit
efe33035acd5f7c13963a4d52e5aac1b68612ae4
[log]
author
Grant Likely <grant.likely@secretlab.ca>
Fri Nov 16 21:01:19 2007 -0700
committer
Grant Likely <grant.likely@secretlab.ca>
Fri Nov 16 21:01:19 2007 -0700
tree
37d6ccca1c82953ae4c41451cb3ec5fe53e2dc3c
parent
4d4faae65e115e327425cd514c1a35146a85166b [diff]
parent
5947f6999aafa7c54c1390983d264a8463dfea8e [diff]
Merge branch 'origin' into kconfig-for-1.3.1

Conflicts:

	drivers/Makefile
tree: 37d6ccca1c82953ae4c41451cb3ec5fe53e2dc3c
  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_avr32/
  13. lib_blackfin/
  14. lib_generic/
  15. lib_i386/
  16. lib_m68k/
  17. lib_microblaze/
  18. lib_mips/
  19. lib_nios/
  20. lib_nios2/
  21. lib_ppc/
  22. libfdt/
  23. nand_spl/
  24. net/
  25. post/
  26. rtc/
  27. tools/
  28. .gitignore
  29. arm_config.mk
  30. avr32_config.mk
  31. blackfin_config.mk
  32. CHANGELOG
  33. CHANGELOG-before-U-Boot-1.1.5
  34. config.mk
  35. COPYING
  36. CREDITS
  37. i386_config.mk
  38. m68k_config.mk
  39. MAINTAINERS
  40. MAKEALL
  41. Makefile
  42. microblaze_config.mk
  43. mips_config.mk
  44. mkconfig
  45. nios2_config.mk
  46. nios_config.mk
  47. ppc_config.mk
  48. README
  49. rules.mk