]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
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)
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


No differences found