summaryrefslogtreecommitdiff
path: root/include/net/regulatory.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-10 13:37:49 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-10 13:37:49 -0500
commit201dacbb1d77e3227aa61b7b9fd375ae201e86b2 (patch)
treeb3d493453c82bb204553f88a56770bab6cda67ac /include/net/regulatory.h
parentb668b9030c0168cf86e054adfe72e89df49b2772 (diff)
parentf4563a75fb93d6a756416d97e13f0773ac373a24 (diff)
Merge branch 'net-checkpatch'
Tobin C. Harding says: ==================== Whitespace checkpatch fixes This patch set fixes various whitespace checkpatch errors and warnings. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/regulatory.h')
0 files changed, 0 insertions, 0 deletions
069646b593d3439171a8a8e2&id2=2b2d3eb41c920b47df2fcedd1489cf748bd09466'>diff)
Merge branch 'sh_eth-E-DMAC-interrupt-mask-cleanups'
Sergei Shtylyov says: ==================== sh_eth: E-DMAC interrupt mask cleanups Here's a set of 3 patches against DaveM's 'net-next.git' repo. The main goal of this set is to stop using the bare numbers for the E-DMAC interrupt masks. [1/3] sh_eth: rename EESIPR bits [2/3] sh_eth: add missing EESIPR bits [3/3] sh_eth: stop using bare numbers for EESIPR values ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/perf/pmu-events/arch/x86/westmereex/frontend.json')