summaryrefslogtreecommitdiffstats
path: root/net/mac80211/ibss.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-26 17:58:05 +0100
committerMark Brown <broonie@linaro.org>2014-03-26 17:58:05 +0100
commit4faa54e52c34cb4559ee1190d0037c9d6b606a67 (patch)
tree136badd391fe842109fdf837a33ddaaae569bd79 /net/mac80211/ibss.c
parentMerge remote-tracking branches 'regulator/topic/doc', 'regulator/topic/enable... (diff)
parentregulator: max1586: Don't allocate memory for regulator_dev pointers (diff)
parentregulator: max77686: Remove regulator_dev array from state container (diff)
parentregulator: max77693: Remove state container as it is not needed (diff)
parentregulator: max8649: Remove regulator_dev pointer from state container (diff)
parentregulator: max8660: Fix brace alignment (diff)
parentregulator: max8907: Remove regulator_dev array from state container (diff)
parentregulator: max8925: Silence checkpatch warning (diff)
parentregulator: max8952: Silence checkpatch warning (diff)
downloadlinux-4faa54e52c34cb4559ee1190d0037c9d6b606a67.tar.xz
linux-4faa54e52c34cb4559ee1190d0037c9d6b606a67.zip
Merge remote-tracking branches 'regulator/topic/max1586', 'regulator/topic/max77686', 'regulator/topic/max77693', 'regulator/topic/max8649', 'regulator/topic/max8660', 'regulator/topic/max8907', 'regulator/topic/max8925' and 'regulator/topic/max8952' into regulator-next
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-11 23:33:02 +0100