Google Git
Sign in
gem5/arm/linux/72c16d9a5c303dce928a52a8861fe7a2a25f849a
commit
72c16d9a5c303dce928a52a8861fe7a2a25f849a
[log]
author
Jiri Kosina <jkosina@suse.cz>
Tue Apr 30 10:17:48 2013 +0200
committer
Jiri Kosina <jkosina@suse.cz>
Tue Apr 30 10:17:48 2013 +0200
tree
b38d03007abcfadf12619d422169a6d4d4000ce7
parent
4f5a81042909fed6977881f22c024aa3582cfcca [diff]
parent
fb4d8d98dc24f66f7f98e6506fad63e1c320cd82 [diff]
Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus

Conflicts:
	drivers/hid/hid-multitouch.c
tree: b38d03007abcfadf12619d422169a6d4d4000ce7
  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