]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Jan 2013 18:41:54 +0000 (10:41 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Jan 2013 18:41:54 +0000 (10:41 -0800)
commit5f243b9b46a22e5790dbbc36f574c2417af49a41
tree923c175213be85ae5b82f4d15db6230283756bf7
parent6ed1914982e9cd46e37a6a6aa9e1fd1de6a50bf7
parent25c92a37a8191b5fdbbba7bdc917e14766a52461
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/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