diff options
author | Olof Johansson <olof@lixom.net> | 2013-04-19 20:50:25 +0200 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-04-19 20:50:25 +0200 |
commit | a71efd61db6368629b1b3e403076c957207f79bd (patch) | |
tree | 76819c82b72f9f6eb4accf658f66d6b565bc3717 /net/mac80211/wme.h | |
parent | Merge tag 'omap-for-v3.10/dss-signed' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
parent | ARM: at91: add defconfig for SAMA5 (diff) | |
download | linux-a71efd61db6368629b1b3e403076c957207f79bd.tar.xz linux-a71efd61db6368629b1b3e403076c957207f79bd.zip |
Merge branch 'at91/soc' into late/cleanup
* at91/soc:
ARM: at91: add defconfig for SAMA5
ARM: at91: dt: add device tree files for SAMA5D3 family
ARM: at91: introduce SAMA5 support
ARM: at91: introduce the core type choice to split ARMv4/5 and ARMv7 arch
ARM: at91: add AT91_SAM9_TIME entry to select at91sam926x_time.c compilation
ARM: at91: change name template in AT91_SOC_START macro
ARM: at91: renamme rm9200 dt file
ARM: at91: rename board-dt to more specific name board-dt-sam9
ARM: at91: move non DT Kconfig to Kconfig.non_dt
Diffstat (limited to 'net/mac80211/wme.h')
0 files changed, 0 insertions, 0 deletions