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
..
autosleep.c	PM: don't use [delayed_]work_pending()	2013-01-26 00:39:11 +01:00
block_io.c	block: kill off REQ_UNPLUG	2011-03-10 08:52:27 +01:00
console.c	PM: make VT switching to the suspend console optional v3	2013-02-20 01:33:41 +01:00
hibernate.c	Power management updates for 3.6	2012-07-22 13:36:52 -07:00
Kconfig	PM / Sleep: Add wake lock api wrapper on top of wakeup sources	2013-07-01 13:40:19 -07:00
main.c	suspend: enable freeze timeout configuration through sys	2013-02-09 22:32:48 +01:00
Makefile	Power: add an API to log wakeup reasons	2014-02-20 02:43:15 +00:00
power.h	PM / Hibernate: Enable suspend to both for in-kernel hibernation.	2012-07-01 13:31:22 +02:00
poweroff.c	power/sysrq: fix inconstistent help message of sysrq key	2013-04-30 17:04:10 -07:00
process.c	Make suspend abort reason logging depend on CONFIG_PM_SLEEP	2014-12-02 21:58:47 +00:00
qos.c	PM: don't use [delayed_]work_pending()	2013-01-26 00:39:11 +01:00
snapshot.c	Power management updates for 3.4	2012-03-21 10:15:51 -07:00
suspend.c	power: Adds functionality to log the last suspend abort reason.	2014-10-29 10:36:27 -07:00
suspend_test.c	driver-core: constify data for class_find_device()	2013-02-06 12:18:56 -08:00
suspend_time.c	power: Add option to log time spent in suspend	2013-07-01 13:34:58 -07:00
swap.c	PM / Hibernate: use rb_entry	2012-11-15 00:37:08 +01:00
user.c	Make wait_for_device_probe() also do scsi_complete_async_scans()	2012-07-18 18:15:46 -07:00
wakelock.c	Revert "PM / Sleep: Require CAP_BLOCK_SUSPEND to use wake_lock/wake_unlock"	2014-01-13 16:36:47 -08:00
wakeup_reason.c	Power: Report suspend times from last_suspend_time	2015-04-09 18:50:24 +00:00