Merge tag 'arm64-uapi' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 02:20:04 +0000 (11:20 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 02:20:04 +0000 (11:20 +0900)
commitb4fe19f78e84813e720d0f0482da22194a7728e3
tree3b38d2b50bfc44e284ed8cc361a7d6b1398bd4fc
parentff69497ad754b0fa9d5935df644890f208f31558
parent48b3b3215f6bc33986f275a0cff508bd9b23fd86
Merge tag 'arm64-uapi' of git://git./linux/kernel/git/cmarinas/linux-aarch64

Pull arm64 uapi disintegration from Catalin Marinas:
 "UAPI headers for arm64 together with some clean-up to make it
  possible:
   - Do not export the COMPAT_* definitions to user
   - Simplify the compat unistd32.h definitions and remove the
     __SYSCALL_COMPAT guard
   - Disintegrate the arch/arm64/include/asm/* headers"

* tag 'arm64-uapi' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
  UAPI: (Scripted) Disintegrate arch/arm64/include/asm
  arm64: Do not export the compat-specific definitions to the user
  arm64: Do not include asm/unistd32.h in asm/unistd.h
  arm64: Remove unused definitions from asm/unistd32.h
arch/arm64/kernel/sys_compat.c