diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-20 23:30:33 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-20 23:30:33 +0100 |
| commit | 79a69d342d71b2b4eafdf51e2451606cfe380a44 (patch) | |
| tree | 7246dbcb872f416b3e27a8020106cf5098cb30f9 /drivers/net/wireless/ath/ath9k/mac.c | |
| parent | Merge branch 'for-linus-2' of git://git.linaro.org/people/rmk/linux-arm (diff) | |
| parent | arm64: mm: update CONTEXTIDR register to contain PID of current process (diff) | |
| download | linux-79a69d342d71b2b4eafdf51e2451606cfe380a44.tar.xz linux-79a69d342d71b2b4eafdf51e2451606cfe380a44.zip | |
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 'drivers/net/wireless/ath/ath9k/mac.c')
0 files changed, 0 insertions, 0 deletions