Google Git
Sign in
kernel/pub/scm/linux/kernel/git/tytso/random/refs/heads/merge-resolve
commit
6b284fe1892e320a76145bdc421fc7222169c98b
[log]
author
Theodore Ts'o <tytso@mit.edu>
Wed Nov 13 20:27:49 2013 -0500
committer
Theodore Ts'o <tytso@mit.edu>
Wed Nov 13 20:27:49 2013 -0500
tree
ade8c8bfbf6876455add22ca0f5c325e3373b2d9
parent
392a546dc8368d1745f9891ef3f8f7c380de8650 [diff]
parent
2821fe6b00a1e902fd399bb4b7e40bc3041f4d44 [diff]
Merge /usr/projects/linux/base into merge-resolve

Conflicts:
	drivers/char/random.c
tree: ade8c8bfbf6876455add22ca0f5c325e3373b2d9
  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