rtime.felk.cvut.cz Git - hercules2020/nv-tegra/linux-4.4.git/commit

]> rtime.felk.cvut.cz Git - hercules2020/nv-tegra/linux-4.4.git/commit

projects / hercules2020 / nv-tegra / linux-4.4.git / commit

author	Dan Willemsen <dwillemsen@nvidia.com>
	Thu, 19 Mar 2015 03:16:02 +0000 (20:16 -0700)
committer	Dan Willemsen <dwillemsen@nvidia.com>
	Thu, 19 Mar 2015 03:16:02 +0000 (20:16 -0700)
commit	8aedd2bf9cd35e46007f2cbd69bd61be0ba5bb9a
tree	a9d9ceba94f66c5e07df37d183d87662ce504d01	tree \| snapshot
parent	8fd3ec11ed8437298f704249c43fd6d1d952fd16	commit \| diff
parent	3dba3c794c3960868ffbdb5a9a647d422596416a	commit \| diff

Merge topic 'incoming' into 'after-upstream-android'

Conflicts:
arch/arm64/Kconfig
arch/arm64/boot/Makefile
arch/arm64/boot/dts/Makefile
arch/arm64/kernel/Makefile
arch/arm64/kernel/setup.c
drivers/cpufreq/cpufreq_stats.c
drivers/input/Kconfig
drivers/input/Makefile
include/trace/events/power.h

72 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/dts/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/entry.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/signal32.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/init.c	diff1 \|	diff2 \|	blob \| history
block/genhd.c	diff1 \|	diff2 \|	blob \| history
drivers/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/base/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/base/power/wakeup.c	diff1 \|	diff2 \|	blob \| history
drivers/base/syscore.c	diff1 \|	diff2 \|	blob \| history
drivers/char/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/char/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_stats.c	diff1 \|	diff2 \|	blob \| history
drivers/cpuidle/governors/menu.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-input.c	diff1 \|	diff2 \|	blob \| history
drivers/input/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/block.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/power/power_supply_sysfs.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/serial_core.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/Makefile	diff1 \|	diff2 \|	blob \| history
fs/fs-writeback.c	diff1 \|	diff2 \|	blob \| history
fs/proc/base.c	diff1 \|	diff2 \|	blob \| history
fs/proc/task_mmu.c	diff1 \|	diff2 \|	blob \| history
fs/pstore/ram.c	diff1 \|	diff2 \|	blob \| history
include/linux/cpufreq.h	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/power_supply.h	diff1 \|	diff2 \|	blob \| history
include/linux/pstore_ram.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/linux/suspend.h	diff1 \|	diff2 \|	blob \| history
include/net/ip.h	diff1 \|	diff2 \|	blob \| history
include/trace/events/power.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/input.h	diff1 \|	diff2 \|	blob \| history
kernel/cpu.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/trace/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
mm/memcontrol.c	diff1 \|	diff2 \|	blob \| history
mm/mmap.c	diff1 \|	diff2 \|	blob \| history
mm/mprotect.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	diff1 \|	diff2 \|	blob \| history
mm/vmscan.c	diff1 \|	diff2 \|	blob \| history
net/Kconfig	diff1 \|	diff2 \|	blob \| history
net/Makefile	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ping.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/datagram.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
scripts/Makefile.lib	diff1 \|	diff2 \|	blob \| history

RSS Atom

Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/dts/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/entry.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/signal32.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/init.c	diff1 \|	diff2 \|	blob \| history
block/genhd.c	diff1 \|	diff2 \|	blob \| history
drivers/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/base/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/base/power/wakeup.c	diff1 \|	diff2 \|	blob \| history
drivers/base/syscore.c	diff1 \|	diff2 \|	blob \| history
drivers/char/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/char/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_stats.c	diff1 \|	diff2 \|	blob \| history
drivers/cpuidle/governors/menu.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-input.c	diff1 \|	diff2 \|	blob \| history
drivers/input/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/block.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/power/power_supply_sysfs.c	diff1 \|	diff2 \|	blob \| history
drivers/tty/serial/serial_core.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/phy/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/video/Makefile	diff1 \|	diff2 \|	blob \| history
fs/fs-writeback.c	diff1 \|	diff2 \|	blob \| history
fs/proc/base.c	diff1 \|	diff2 \|	blob \| history
fs/proc/task_mmu.c	diff1 \|	diff2 \|	blob \| history
fs/pstore/ram.c	diff1 \|	diff2 \|	blob \| history
include/linux/cpufreq.h	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/power_supply.h	diff1 \|	diff2 \|	blob \| history
include/linux/pstore_ram.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/linux/suspend.h	diff1 \|	diff2 \|	blob \| history
include/net/ip.h	diff1 \|	diff2 \|	blob \| history
include/trace/events/power.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/input.h	diff1 \|	diff2 \|	blob \| history
kernel/cpu.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/trace/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
mm/memcontrol.c	diff1 \|	diff2 \|	blob \| history
mm/mmap.c	diff1 \|	diff2 \|	blob \| history
mm/mprotect.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
mm/shmem.c	diff1 \|	diff2 \|	blob \| history
mm/vmscan.c	diff1 \|	diff2 \|	blob \| history
net/Kconfig	diff1 \|	diff2 \|	blob \| history
net/Makefile	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ping.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/datagram.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
scripts/Makefile.lib	diff1 \|	diff2 \|	blob \| history