projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0356888 a3b7125)
Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android...
authorMark Brown <broonie@linaro.org>
Tue, 11 Mar 2014 09:47:53 +0000 (09:47 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 11 Mar 2014 09:47:53 +0000 (09:47 +0000)
commit943550a24c51bdd971f579200f286241548deaf7
tree4b275941890744cf4ea588ea59db7cd6558647b6tree | snapshot
parent0356888ad14044efe98b16a731ba56d74b89269ecommit | diff
parenta3b71254e95dc167ddca600c0ca426e8ce2fad3fcommit | diff
Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android into linux-linaro-lsk-android

Conflicts:
arch/arm64/include/asm/cmpxchg.h
drivers/cpufreq/cpufreq.c
include/net/tcp.h
net/ipv4/ping.c
net/ipv4/sysctl_net_ipv4.c
net/netfilter/xt_qtaguid.c
drivers/cpufreq/cpufreq_governor.c diff1 | diff2 | blob | history
include/net/ipv6.h diff1 | diff2 | blob | history
include/net/tcp.h diff1 | diff2 | blob | history
net/ipv4/ping.c diff1 | diff2 | blob | history
net/ipv4/sysctl_net_ipv4.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/ipv4/tcp_output.c diff1 | diff2 | blob | history
net/ipv6/icmp.c diff1 | diff2 | blob | history
net/netfilter/xt_qtaguid.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.