diff options
author | David S. Miller <davem@davemloft.net> | 2015-05-31 01:07:06 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-05-31 01:07:06 -0700 |
commit | a9ab2184f451ec78af245ebb8b663d8700d44672 (patch) | |
tree | 2d7c40031306c541dc28b798bdc3aaea8f90c48f /net/mac80211/main.c | |
parent | abf2e7d6e2e315b32ee00067a69aaad2cf4e1b3f (diff) | |
parent | 8ea64e27080eb66dc26f64f28485c0bc9fc06b36 (diff) |
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
Antonio Quartulli says:
====================
Included changes:
- checkpatch fixes
- code cleanup
- debugfs component is now compiled only if DEBUG_FS is selected
- update copyright years
- disable by default not-so-user-safe features
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/main.c')
0 files changed, 0 insertions, 0 deletions