Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

0f74d82d

Commit 0f74d82d authored 11 years ago by John W. Linville

Downloads
- Plain Diff

Merge branch 'master' of...

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem

parents 732256b9 2eff7c79

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/wireless/iwlwifi/pcie/drv.c 8 additions, 2 deletions

drivers/net/wireless/iwlwifi/pcie/drv.c
drivers/net/wireless/mac80211_hwsim.c 1 addition, 1 deletion

drivers/net/wireless/mac80211_hwsim.c
net/mac80211/tx.c 13 additions, 10 deletions

net/mac80211/tx.c
net/nfc/core.c 1 addition, 1 deletion

net/nfc/core.c

with 23 additions and 14 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment