Merge branch 'chromeos-kernelupstream-6.0-android' into chromeos-kernelupstream-6.0
Change-Id: I5cdb716f4f1a0c65107930023790edbd9cb73ead
Showing
- drivers/base/power/main.c 1 addition, 0 deletionsdrivers/base/power/main.c
- drivers/cpufreq/Kconfig 16 additions, 0 deletionsdrivers/cpufreq/Kconfig
- drivers/cpufreq/Makefile 6 additions, 1 deletiondrivers/cpufreq/Makefile
- drivers/cpufreq/cpufreq.c 3 additions, 0 deletionsdrivers/cpufreq/cpufreq.c
- drivers/cpufreq/cpufreq_times.c 211 additions, 0 deletionsdrivers/cpufreq/cpufreq_times.c
- drivers/cpufreq/dummy-cpufreq.c 60 additions, 0 deletionsdrivers/cpufreq/dummy-cpufreq.c
- drivers/gpu/drm/drm_ioctl.c 3 additions, 3 deletionsdrivers/gpu/drm/drm_ioctl.c
- drivers/misc/Kconfig 15 additions, 0 deletionsdrivers/misc/Kconfig
- drivers/misc/Makefile 2 additions, 1 deletiondrivers/misc/Makefile
- drivers/misc/uid_sys_stats.c 706 additions, 0 deletionsdrivers/misc/uid_sys_stats.c
- drivers/usb/gadget/function/f_accessory.c 14 additions, 2 deletionsdrivers/usb/gadget/function/f_accessory.c
- fs/eventpoll.c 3 additions, 2 deletionsfs/eventpoll.c
- fs/fuse/dev.c 1 addition, 0 deletionsfs/fuse/dev.c
- fs/proc/base.c 7 additions, 0 deletionsfs/proc/base.c
- fs/sync.c 2 additions, 1 deletionfs/sync.c
- include/linux/cpufreq_times.h 42 additions, 0 deletionsinclude/linux/cpufreq_times.h
- include/linux/ipv6.h 1 addition, 0 deletionsinclude/linux/ipv6.h
- include/linux/netfilter/xt_quota2.h 26 additions, 0 deletionsinclude/linux/netfilter/xt_quota2.h
- include/linux/sched.h 4 additions, 0 deletionsinclude/linux/sched.h
- include/linux/sched/xacct.h 9 additions, 0 deletionsinclude/linux/sched/xacct.h
Loading
Please register or sign in to comment