Google Git
Sign in
gem5/arm/linux/56ccd186f1837dd418cd094f0e96b3196bbab9ef
commit
56ccd186f1837dd418cd094f0e96b3196bbab9ef
[log] [tgz]
author
Jiri Kosina <jkosina@suse.cz>
Tue May 22 11:32:31 2012 +0200
committer
Jiri Kosina <jkosina@suse.cz>
Tue May 22 11:32:31 2012 +0200
tree
195cdd3973a1288eb84f51f0ec28a947b333c2c5
parent
b3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e [diff]
parent
d1257081aecf44455fcab8675f1d54e8b242faa1 [diff]
Merge branch 'upstream' into for-linus

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