summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx6dl-hummingboard.dts
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2018-05-23 11:05:26 +0200
committerJohannes Berg <johannes.berg@intel.com>2018-05-23 11:05:59 +0200
commitdd8070bff204a67fcb6585f18047841a895b68d7 (patch)
treecce17d4b8eb8987194beb40498c8f83e74d6799f /arch/arm/boot/dts/imx6dl-hummingboard.dts
parentcfg80211: add missing kernel-doc (diff)
parentMerge branch 'qed-firmware-TLV' (diff)
downloadlinux-dd8070bff204a67fcb6585f18047841a895b68d7.tar.xz
linux-dd8070bff204a67fcb6585f18047841a895b68d7.zip
Merge remote-tracking branch 'net-next/master' into mac80211-next
Bring in net-next which had pulled in net, so I have the changes from mac80211 and can apply a patch that would otherwise conflict. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6dl-hummingboard.dts')
0 files changed, 0 insertions, 0 deletions