projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e8f1caf 42f504e)
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
authorAlex Shi <alex.shi@linaro.org>
Tue, 10 Mar 2015 02:02:32 +0000 (10:02 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 10 Mar 2015 02:02:32 +0000 (10:02 +0800)
commitc577a32260e3c74bd2ccf42273c2f5cdf981b9a0
tree781fff52a3bb901f96a086ea788c08596ad396cetree | snapshot
parente8f1cafd746408478934b9c8b9e9e0d5f450906ccommit | diff
parent42f504e28a169ebfea0e3d9c6e151451800e41d5commit | diff
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Most of cpu feature which hardcode in commit 3868e7f8d4799 are
included in compat_hwcap_str[]. We don't need repeat them.

Conflicts:
arch/arm64/kernel/setup.c
12 files changed:
arch/arm64/kernel/setup.c diff1 | diff2 | blob | history
arch/arm64/kernel/signal32.c diff1 | diff2 | blob | history
drivers/gpio/gpiolib.c diff1 | diff2 | blob | history
include/net/ip.h diff1 | diff2 | blob | history
include/net/netns/ipv4.h diff1 | diff2 | blob | history
kernel/trace/trace.c 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_ipv4.c diff1 | diff2 | blob | history
net/ipv6/datagram.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.