nv-tegra.nvidia Code Review - linux-4.9.git/commit

]> nv-tegra.nvidia Code Review - linux-4.9.git/commit

author	Ketan Patil <ketanp@nvidia.com>
	Mon, 29 Oct 2018 08:12:22 +0000 (13:42 +0530)
committer	Ketan Patil <ketanp@nvidia.com>
	Mon, 29 Oct 2018 08:13:41 +0000 (13:43 +0530)
commit	c9ebc27e299c65ea048ba7c2a75f59c7d74e2f7c
tree	f9c5db1e3a422b811640d042a4593d28857e0f67	tree \| snapshot
parent	445134a46eb973c849e16de9411c7a0968c13d01	commit \| diff
parent	a71bdfbbc91d2c29e512d3c15c2775dde4c914b7	commit \| diff

Merge branch 'dev/android-4.9.135-o' into rel-32-4.9

Minor Kernel upgrade from K4.9.129-o to K4.9.135-o

Bug 200462094

Resolved Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-sony.c

Change-Id: Ibd9cc4d062eee5df9944fc5fe30d4eb68d98031b
Signed-off-by: Ketan Patil <ketanp@nvidia.com>

38 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
crypto/ablkcipher.c	diff1 \|	diff2 \|	blob \| history
crypto/blkcipher.c	diff1 \|	diff2 \|	blob \| history
drivers/base/power/main.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_stats.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib-of.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-core.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-sony.c	diff1 \|	diff2 \|	blob \| history
drivers/media/usb/uvc/uvc_video.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/quirks.c	diff1 \|	diff2 \|	blob \| history
drivers/regulator/core.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd.c	diff1 \|	diff2 \|	blob \| history
drivers/thermal/of-thermal.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/driver.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-pci.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/super.c	diff1 \|	diff2 \|	blob \| history
fs/proc/base.c	diff1 \|	diff2 \|	blob \| history
fs/xattr.c	diff1 \|	diff2 \|	blob \| history
include/linux/power_supply.h	diff1 \|	diff2 \|	blob \| history
kernel/cgroup.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/cputime.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/time/alarmtimer.c	diff1 \|	diff2 \|	blob \| history
lib/rhashtable.c	diff1 \|	diff2 \|	blob \| history
mm/huge_memory.c	diff1 \|	diff2 \|	blob \| history
mm/madvise.c	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_nat_core.c	diff1 \|	diff2 \|	blob \| history
sound/hda/hdac_controller.c	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-dapm.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

Makefile	diff1 \|	diff2 \|	blob \| history
crypto/ablkcipher.c	diff1 \|	diff2 \|	blob \| history
crypto/blkcipher.c	diff1 \|	diff2 \|	blob \| history
drivers/base/power/main.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_stats.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib-of.c	diff1 \|	diff2 \|	blob \| history
drivers/gpio/gpiolib.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-core.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-sony.c	diff1 \|	diff2 \|	blob \| history
drivers/media/usb/uvc/uvc_video.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/quirks.c	diff1 \|	diff2 \|	blob \| history
drivers/regulator/core.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd.c	diff1 \|	diff2 \|	blob \| history
drivers/thermal/of-thermal.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/driver.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci-pci.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/super.c	diff1 \|	diff2 \|	blob \| history
fs/proc/base.c	diff1 \|	diff2 \|	blob \| history
fs/xattr.c	diff1 \|	diff2 \|	blob \| history
include/linux/power_supply.h	diff1 \|	diff2 \|	blob \| history
kernel/cgroup.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/cputime.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/time/alarmtimer.c	diff1 \|	diff2 \|	blob \| history
lib/rhashtable.c	diff1 \|	diff2 \|	blob \| history
mm/huge_memory.c	diff1 \|	diff2 \|	blob \| history
mm/madvise.c	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_nat_core.c	diff1 \|	diff2 \|	blob \| history
sound/hda/hdac_controller.c	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-dapm.c	diff1 \|	diff2 \|	blob \| history