diff options
| author | Stepan Moskovchenko <stepanm@codeaurora.org> | 2015-06-03 14:10:00 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:15:56 -0700 |
| commit | 3182b97badf48921a108650eb87818fbf6b47e20 (patch) | |
| tree | cde624ed25fa9479f6791c9269f7adb2eba096fe /arch/sparc/lib | |
| parent | e901e28d560601d5fa52b3c8a58c62f764ec1642 (diff) | |
arm64: Fix conflict resolution in cpuinfo CPU reporting
Commit ebc4e05c338bde49382c7c46ce6b8a371713862e ("arm64: show
present cpu instead of online cpu in /proc/cpuinfo") did not
have its conflicts against msm-3.18 properly resolved.
Change-Id: I1f4eb1d8a20b2bc142a7f0b8890d383a9552557c
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
[satyap: trivial merge conflict resolution and move changes
in arch/arm64/kernel from setup.c to cpuinfo.c to
align with kernel 4.4]
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
Diffstat (limited to 'arch/sparc/lib')
0 files changed, 0 insertions, 0 deletions