Merge branch 'master' of... (029d3ac9) · Commits · Linaro / qcomlt / kernel · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

K

kernel
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

029d3ac9

Commit 029d3ac9 authored 10 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 f34c4a35 5869e795

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

drivers/net/wireless/ath/ath9k/ar5008_phy.c 1 addition, 3 deletions

drivers/net/wireless/ath/ath9k/ar5008_phy.c
drivers/net/wireless/ath/ath9k/beacon.c 3 additions, 4 deletions

drivers/net/wireless/ath/ath9k/beacon.c
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c 4 additions, 1 deletion

drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
drivers/net/wireless/ath/ath9k/init.c 2 additions, 0 deletions

drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/b43/phy_n.c 7 additions, 7 deletions

drivers/net/wireless/b43/phy_n.c
drivers/net/wireless/rsi/rsi_91x_core.c 4 additions, 2 deletions

drivers/net/wireless/rsi/rsi_91x_core.c
drivers/net/wireless/rsi/rsi_91x_debugfs.c 16 additions, 19 deletions

drivers/net/wireless/rsi/rsi_91x_debugfs.c
drivers/net/wireless/rsi/rsi_91x_mgmt.c 5 additions, 3 deletions

drivers/net/wireless/rsi/rsi_91x_mgmt.c
drivers/net/wireless/rsi/rsi_91x_sdio.c 3 additions, 2 deletions

drivers/net/wireless/rsi/rsi_91x_sdio.c
drivers/net/wireless/rsi/rsi_91x_sdio_ops.c 2 additions, 4 deletions

drivers/net/wireless/rsi/rsi_91x_sdio_ops.c
drivers/net/wireless/rsi/rsi_91x_usb.c 19 additions, 7 deletions

drivers/net/wireless/rsi/rsi_91x_usb.c
drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c 0 additions, 10 deletions

drivers/net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c

with 66 additions and 62 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