GoogleGit

commit758fff4a887c5d8091e5ee7873fbb93e863afdf0[log][tgz]
authorAndres Morales <anmorales@google.com>Tue Apr 21 13:03:32 2015 -0700
committerAndres Morales <anmorales@google.com>Tue Apr 21 13:12:03 2015 -0700
treef2ffdc871fff17049b1cf04bfdf1eeaebb790acb
parent1f666ddd62c9d716ada6b6145c14841b42599598[diff]
parent98a4d82a78914c2496989d669ecae04dedcf361f[diff]
Merge branch 'android-3.10' into android-tegra-3.10

98a4d82 SELinux: use deletion-safe iterator to free list
6902d1f subsystem: CPU FREQUENCY DRIVERS- Set cpu_load calculation on
current frequency
86aa048 proc: uid_cputime: create uids from kuids
c8b4bc5 wakeup: Add last wake up source logging for suspend abort
reason.
53be74a selinux: add SOCK_DIAG_BY_FAMILY to the list of netlink message
types
93870d0 selinux/nlmsg: add XFRM_MSG_MAPPING
eb78bc3 selinux/nlmsg: add XFRM_MSG_MIGRATE
054bcd8 selinux/nlmsg: add XFRM_MSG_REPORT
865f73f selinux/nlmsg: add XFRM_MSG_[NEW|GET]SADINFO
bf7f260 selinux/nlmsg: add XFRM_MSG_GETSPDINFO
4f800a6 selinux/nlmsg: add XFRM_MSG_NEWSPDINFO
8daca97 SELinux: per-command whitelisting of ioctls
c8c3cd4 security: lsm_audit: add ioctl specific auditing
c2e60d7 Power: Report suspend times from last_suspend_time
11a2b3d arm: crypto: Add optimized SHA-256/224
3aaf466 proc: uid: Adds accounting for the cputimes per uid.
1f666dd video: tegra: adf: export simple buffers to userspace as R/W

Signed-off-by: Andres Morales <anmorales@google.com>

Bug: 20068129
Bug: 18087110

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