From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Jan 2013 18:41:54 +0000 (-0800)
Subject: Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas... 
X-Git-Tag: firefly_0821_release~3680^2~1308
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5f243b9b46a22e5790dbbc36f574c2417af49a41;p=firefly-linux-kernel-4.4.55.git

Merge tag 'arm64-fixes' of git://git./linux/kernel/git/cmarinas/linux-aarch64

Pull ARM64 fixes from Catalin Marinas:
 - Missing include in asm/compat.h.
 - Kconfig updates.

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
  arm64: Always select ARM_AMBA and GENERIC_GPIO
  arm64: Keep the ARM64 Kconfig selects sorted
  arm64: Include linux/ptrace.h in asm/compat.h
---

5f243b9b46a22e5790dbbc36f574c2417af49a41