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	Ishan Mittal <imittal@nvidia.com>
	Thu, 9 Apr 2015 09:10:51 +0000 (14:40 +0530)
committer	Ishan Mittal <imittal@nvidia.com>
	Thu, 9 Apr 2015 09:10:51 +0000 (14:40 +0530)
commit	067f91ab18480c792333ae9da3175a13ae4c9017
tree	6be2a3f176d08895c796f0bbb9d28afa36df6310	tree \| snapshot
parent	c9a90edd7f207d5fc07818d09548ece49c623e29	commit \| diff
parent	d36c3b70f4c421ec925ee820a82a98898657103d	commit \| diff

Merge branch android-3.18 into dev-kernel-3.18

Conflicts:
drivers/clk/Kconfig
drivers/clk/clk.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/staging/android/Kconfig
drivers/staging/android/alarm-dev.c
drivers/staging/android/sync.c
drivers/staging/android/uapi/android_alarm.h

Change-Id: I7f4b16ac1d79e54713eff33cc4f9ce26444e733a
Signed-off-by: Ishan Mittal <imittal@nvidia.com>

13 files changed:

RSS Atom

arch/arm/kernel/smp.c	diff1 \|	diff2 \|	blob \| history
drivers/clk/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/clk/clk.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/misc/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/platform/tegra/tegra_wakeup_monitor.c	diff1 \|	\|	blob \| history
drivers/staging/android/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/android/sync.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/function/f_accessory.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/function/f_mtp.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
mm/memcontrol.c	diff1 \|	diff2 \|	blob \| history