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

Browse source

...

This commit is contained in:

John W. Linville 2013-02-25 14:50:31 -05:00

parent ea5cdccc46 dc4a787c8f

commit 6d6436fbcb

3 changed files with 5 additions and 29 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

View file

21

drivers/net/wireless/mwifiex/pcie.c

View file

9

drivers/net/wireless/mwifiex/sdio.c

View file