Google Git
Sign in
gem5/arm/linux-arm-legacy/2c41c8eb2b3014ddb4de53fec533edfa47a96db3
commit
2c41c8eb2b3014ddb4de53fec533edfa47a96db3
[log]
author
Andrey Konovalov <andrey.konovalov@linaro.org>
Tue Apr 15 01:23:46 2014 +0400
committer
Andrey Konovalov <andrey.konovalov@linaro.org>
Tue Apr 15 01:23:46 2014 +0400
tree
2a11d9b2fbc72598589523742eac98af3a09d3ff
parent
dbb07139ef78699b07137e3974aa9638cfa2d57a [diff]
parent
2609fbf2f5158f57b1c41a5fa2c18fffc6016342 [diff]
Automatically merging tracking-linaro-android-3.14 into merge-linux-linaro-core-tracking

Conflicting files:
tree: 2a11d9b2fbc72598589523742eac98af3a09d3ff
  1. android/
  2. arch/
  3. block/
  4. crypto/
  5. Documentation/
  6. drivers/
  7. firmware/
  8. fs/
  9. include/
  10. init/
  11. ipc/
  12. kernel/
  13. lib/
  14. linaro/
  15. mm/
  16. net/
  17. samples/
  18. scripts/
  19. security/
  20. sound/
  21. tools/
  22. usr/
  23. virt/
  24. .gitignore
  25. .mailmap
  26. COPYING
  27. CREDITS
  28. Kbuild
  29. Kconfig
  30. MAINTAINERS
  31. Makefile
  32. README
  33. REPORTING-BUGS