Google Git
Sign in
gem5/arm/linux/b3aec7b686329e6bb65aa08c7f9458f7fd512f06
commit
b3aec7b686329e6bb65aa08c7f9458f7fd512f06
[log]
author
Jiri Kosina <jkosina@suse.cz>
Tue Oct 25 09:59:04 2011 +0200
committer
Jiri Kosina <jkosina@suse.cz>
Tue Oct 25 09:59:04 2011 +0200
tree
67ae55567b5747f32ddd76dd63621bd2ca756a88
parent
f6f12427844516bc8e9cf84f43aca7bbbaa48157 [diff]
parent
1bcc20675a1ac1ba47eaa201e02a89b0508e17b2 [diff]
Merge branch 'upstream' into for-linus

Conflicts:
	drivers/hid/hid-core.c
	drivers/hid/hid-ids.h
tree: 67ae55567b5747f32ddd76dd63621bd2ca756a88
  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