Amit Pundir 5b59692ae6 Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common ... * android-3.10: (23 commits) proc: uid_cputime: create uids from kuids wakeup: Add last wake up source logging for suspend abort reason. selinux: add SOCK_DIAG_BY_FAMILY to the list of netlink message types selinux/nlmsg: add XFRM_MSG_MAPPING selinux/nlmsg: add XFRM_MSG_MIGRATE selinux/nlmsg: add XFRM_MSG_REPORT selinux/nlmsg: add XFRM_MSG_[NEW|GET]SADINFO selinux/nlmsg: add XFRM_MSG_GETSPDINFO selinux/nlmsg: add XFRM_MSG_NEWSPDINFO SELinux: per-command whitelisting of ioctls security: lsm_audit: add ioctl specific auditing Power: Report suspend times from last_suspend_time arm: crypto: Add optimized SHA-256/224 proc: uid: Adds accounting for the cputimes per uid. USB: gadget: android: Integrate f_midi USB MIDI gadget driver part deux android: base-cfg: disable ALARM_DEV staging: Remove logger and alarm-dev from android Makefile staging: Remove the Android alarm-dev driver staging: Remove the Android logger driver net: ping: fix constness inconsistency in ipv6_chk_addr ...		2015-04-16 13:34:01 +05:30
..
apparmor	sched: move no_new_privs into new atomic flags	2014-10-07 16:42:32 -07:00
integrity	ima: eliminate passing d_name.name to process_measurement()	2013-04-17 17:20:57 -07:00
keys	aio: don't include aio.h in sched.h	2013-05-07 20:16:25 -07:00
selinux	selinux: add SOCK_DIAG_BY_FAMILY to the list of netlink message types	2015-04-13 14:34:34 -07:00
smack	Smack: include magic.h in smackfs.c	2013-04-03 13:13:51 +11:00
tomoyo	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
yama	yama: Better permission check for ptraceme	2013-03-26 13:17:58 -07:00
capability.c	Add security hooks to binder and implement the hooks for SELinux.	2015-01-13 22:48:51 +00:00
commoncap.c	security: Add proper checks for Android specific capability checks	2013-07-01 13:40:45 -07:00
device_cgroup.c	devcg: remove parent_cgroup.	2013-04-18 11:34:35 -07:00
inode.c	securityfs: fix object creation races	2012-01-10 10:20:35 -05:00
Kconfig	security: select correct default LSM_MMAP_MIN_ADDR on arm on arm64	2014-07-22 10:09:56 -07:00
lsm_audit.c	security: lsm_audit: add ioctl specific auditing	2015-04-13 19:55:16 +00:00
Makefile	security: Yama LSM	2012-02-10 09:18:52 +11:00
min_addr.c	mmap_min_addr check CAP_SYS_RAWIO only for write	2010-04-23 08:56:31 +10:00
security.c	Add security hooks to binder and implement the hooks for SELinux.	2015-01-13 22:48:51 +00:00