Google Git
Sign in
third-party-mirror/u-boot/d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96
commit
d3c23a790fb24f9cb5cc467b81b0c3ad3eeb1f96
[log]
author
Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Wed Aug 20 09:37:09 2008 +0200
committer
Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Wed Aug 20 09:37:09 2008 +0200
tree
605af42f8834ea0b793e7febe4aba5d899e5f160
parent
fcd69a1a57fb2af4d26201422095a4be9f36963e [diff]
parent
33eac2b3d946fc998a09245dfe54d017079b9056 [diff]
Merge branch 'next' of git://git.denx.de/u-boot-avr32

Conflicts:

	MAINTAINERS
tree: 605af42f8834ea0b793e7febe4aba5d899e5f160
  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. lib_sparc/
  25. libfdt/
  26. nand_spl/
  27. net/
  28. onenand_ipl/
  29. post/
  30. tools/
  31. .gitignore
  32. arm_config.mk
  33. avr32_config.mk
  34. blackfin_config.mk
  35. CHANGELOG
  36. CHANGELOG-before-U-Boot-1.1.5
  37. config.mk
  38. COPYING
  39. CREDITS
  40. i386_config.mk
  41. m68k_config.mk
  42. MAINTAINERS
  43. MAKEALL
  44. Makefile
  45. microblaze_config.mk
  46. mips_config.mk
  47. mkconfig
  48. nios2_config.mk
  49. nios_config.mk
  50. ppc_config.mk
  51. README
  52. rules.mk
  53. sh_config.mk
  54. sparc_config.mk