summary refs log tree commit diff
path: root/net/ipv6/af_inet6.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-20 14:30:33 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-20 14:30:33 -0800
commit79a69d342d71b2b4eafdf51e2451606cfe380a44 (patch)
tree7246dbcb872f416b3e27a8020106cf5098cb30f9 /net/ipv6/af_inet6.c
parent6db167dfc013b0e114c81077ac091ba26a69f4ed (diff)
parentec45d1cfd3cb65121fc52f39efc17d832f4f7b91 (diff)
downloadlinux-79a69d342d71b2b4eafdf51e2451606cfe380a44.tar.gz
Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64
Pull arm64 patches from Catalin Marinas:

 - SMP support for the PSCI booting protocol (power state coordination
   interface).

 - Simple earlyprintk support.

 - Platform devices populated by default from the DT (SoC-agnostic).

 - CONTEXTIDR support (used by external trace tools).

* tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
  arm64: mm: update CONTEXTIDR register to contain PID of current process
  arm64: atomics: fix grossly inconsistent asm constraints for exclusives
  arm64: compat: use compat_uptr_t type for compat_ucontext.uc_link
  arm64: Select ARCH_WANT_FRAME_POINTERS
  arm64: Add kvm_para.h and xor.h generic headers
  arm64: SMP: enable PSCI boot method
  arm64: psci: add support for PSCI invocations from the kernel
  arm64: SMP: rework the SMP code to be enabling method agnostic
  arm64: perf: add guest vs host discrimination
  arm64: add COMPAT_PSR_*_BIT flags
  arm64: Add simple earlyprintk support
  arm64: Populate the platform devices
Diffstat (limited to 'net/ipv6/af_inet6.c')
0 files changed, 0 insertions, 0 deletions