summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/ath9k/ar9003_phy.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-07 17:51:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-07 17:51:34 -0700
commit3573d3869de475cca9f2d4998fc3c2871a4cc2db (patch)
tree5b556cd8abcef8014f5ea4b9e95835ba4badc40a /drivers/net/wireless/ath/ath9k/ar9003_phy.c
parentc8d9762affa0a97e299be2cabfec861515ef1580 (diff)
parent61fb4bfc010b0d2940f7fd87acbce6a0f03217cb (diff)
Merge tag 'arc-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC changes from Vineet Gupta: - Support for external initrd from Noam - Fix broken serial console in nsimosci Virtual Platform - Reuse of ENTRY/END assembler macros across hand asm code - Other minor fixes here and there * tag 'arc-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: ARC: [nsimosci] Unbork console ARC: [nsimosci] Change .dts to use generic 8250 UART ARC: [SMP] General Fixes ARC: Remove unused DT template file ARC: [clockevent] simplify timer ISR ARC: [clockevent] can't be SoC specific ARC: Remove ARC_HAS_COH_RTSC ARC: switch to generic ENTRY/END assembler annotations ARC: support external initrd ARC: add uImage to .gitignore ARC: [arcfpga] Fix __initconst data const-correctness
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ar9003_phy.c')
0 files changed, 0 insertions, 0 deletions