Google Git
Sign in
kernel/pub/scm/linux/kernel/git/maz/u-boot/refs/heads/sunxi-merge
commit
39ee32d45fa601c2eb73f8c8c63c6f443cf720ed
[log]
author
Marc Zyngier <marc.zyngier@arm.com>
Sun Dec 29 10:44:47 2013 +0000
committer
Marc Zyngier <marc.zyngier@arm.com>
Sun Dec 29 10:44:47 2013 +0000
tree
d6ae28b651b9488304be940f902abf05771807ac
parent
fef24f4f38eb685a6da29097930e6e49b378f8fb [diff]
parent
25ae46bbbd3d127d0476d5b66a4595f0b3479b69 [diff]
Merge remote-tracking branch 'sunxi/sunxi' into sunxi-merge

Conflicts:
	arch/arm/cpu/armv7/Makefile
tree: d6ae28b651b9488304be940f902abf05771807ac
  1. api/
  2. arch/
  3. board/
  4. common/
  5. disk/
  6. doc/
  7. drivers/
  8. dts/
  9. examples/
  10. fs/
  11. include/
  12. lib/
  13. Licenses/
  14. nand_spl/
  15. net/
  16. post/
  17. scripts/
  18. spl/
  19. test/
  20. tools/
  21. .checkpatch.conf
  22. .gitignore
  23. boards.cfg
  24. config.mk
  25. CREDITS
  26. MAKEALL
  27. Makefile
  28. mkconfig
  29. README
  30. rules.mk
  31. snapshot.commit