Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit - drivers/eisa/eisa-bus.c

projects / firefly-linux-kernel-4.4.55.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b674d6e 146f542)

author	Alex Shi <alex.shi@linaro.org>
	Fri, 17 Apr 2015 05:40:43 +0000 (13:40 +0800)
committer	Alex Shi <alex.shi@linaro.org>
	Fri, 17 Apr 2015 05:40:43 +0000 (13:40 +0800)
commit	26fb95cac56be1885787cfc69881d906f4814c46
tree	c6f0f9fdb95a0ba6bd2bdd354adcd622493c8e26	tree \| snapshot
parent	b674d6ecd467c91c826536240ee6863d13ff83c0	commit \| diff
parent	146f542aac2cc725aa32f51b354eba5ece7ae08b	commit \| diff

Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-android

Remove conflictsed drivers/staging/android/logger.c

drivers/cpuidle/governors/menu.c	diff1 \|	diff2 \|	blob \| history
include/linux/cgroup.h	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history
security/selinux/ss/policydb.c	diff1 \|	diff2 \|	blob \| history

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