projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
abf2e7d
8ea64e2
)
Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge
author
David S. Miller
<
[email protected]
>
Sun, 31 May 2015 08:07:06 +0000
(
01:07
-0700)
committer
David S. Miller
<
[email protected]
>
Sun, 31 May 2015 08:07:06 +0000
(
01:07
-0700)
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 <
[email protected]
>
Trivial merge