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

Browse source

...

This commit is contained in:

David S. Miller 2011-07-08 09:36:30 -07:00

parent 0a0e2344a6 204d1641d2

commit a05e42c27f

124 changed files with 6268 additions and 1033 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

128

Documentation/networking/nfc.txt

View file

2

drivers/Kconfig

View file

1

drivers/Makefile

View file

6

drivers/bcma/Kconfig

View file

1

drivers/bcma/Makefile

View file

4

drivers/bcma/bcma_private.h

View file

38

drivers/bcma/driver_pci.c

View file

14

drivers/bcma/driver_pci_host.c

View file

3

drivers/net/wireless/ath/carl9170/carl9170.h

View file

2

drivers/net/wireless/ath/carl9170/fw.c

View file

19

drivers/net/wireless/ath/carl9170/fwcmd.h

View file

18

drivers/net/wireless/ath/carl9170/fwdesc.h

View file

13

drivers/net/wireless/ath/carl9170/hw.h

View file

11

drivers/net/wireless/ath/carl9170/main.c

View file

6

drivers/net/wireless/ath/carl9170/phy.c

View file

6

drivers/net/wireless/ath/carl9170/version.h

View file

25

drivers/net/wireless/ath/carl9170/wlan.h

View file

1

drivers/net/wireless/b43/dma.c

View file

2

drivers/net/wireless/ipw2x00/ipw2100.c

View file

1

drivers/net/wireless/iwlwifi/Makefile

View file

2

drivers/net/wireless/iwlwifi/iwl-1000.c

View file

21

drivers/net/wireless/iwlwifi/iwl-2000.c

View file

4

drivers/net/wireless/iwlwifi/iwl-5000.c

View file

5

drivers/net/wireless/iwlwifi/iwl-6000.c

View file

16

drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c

View file

88

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

View file

19

drivers/net/wireless/iwlwifi/iwl-agn-rxon.c

View file

90

drivers/net/wireless/iwlwifi/iwl-agn-tx.c

View file

8

drivers/net/wireless/iwlwifi/iwl-agn-ucode.c

View file

54

drivers/net/wireless/iwlwifi/iwl-agn.c

View file

5

drivers/net/wireless/iwlwifi/iwl-agn.h

View file

22

drivers/net/wireless/iwlwifi/iwl-core.c

View file

18

drivers/net/wireless/iwlwifi/iwl-core.h

View file

22

drivers/net/wireless/iwlwifi/iwl-dev.h

View file

13

drivers/net/wireless/iwlwifi/iwl-hcmd.c

View file

3

drivers/net/wireless/iwlwifi/iwl-pci.c

View file

19

drivers/net/wireless/iwlwifi/iwl-prph.h

View file

47

drivers/net/wireless/iwlwifi/iwl-rx.c

View file

236

drivers/net/wireless/iwlwifi/iwl-testmode.h

View file

423

drivers/net/wireless/iwlwifi/iwl-trans.c

View file

64

drivers/net/wireless/iwlwifi/iwl-trans.h

View file

139

drivers/net/wireless/iwlwifi/iwl-tx.c

View file

4

drivers/net/wireless/mwifiex/sdio.h

View file

1

drivers/net/wireless/rt2x00/rt2400pci.c

View file

1

drivers/net/wireless/rt2x00/rt2500pci.c

View file

1

drivers/net/wireless/rt2x00/rt2500usb.c

View file

2

drivers/net/wireless/rt2x00/rt2800pci.c

View file

5

drivers/net/wireless/rt2x00/rt2800usb.c

View file

1

drivers/net/wireless/rt2x00/rt2x00.h

View file

6

drivers/net/wireless/rt2x00/rt2x00crypto.c

View file

3

drivers/net/wireless/rt2x00/rt2x00lib.h

View file

14

drivers/net/wireless/rt2x00/rt2x00mac.c

View file

108

drivers/net/wireless/rt2x00/rt2x00queue.c

View file

2

drivers/net/wireless/rt2x00/rt2x00queue.h

View file

1

drivers/net/wireless/rt2x00/rt61pci.c

View file

1

drivers/net/wireless/rt2x00/rt73usb.c

View file

4

drivers/net/wireless/rtlwifi/pci.c

View file

1

drivers/net/wireless/rtlwifi/pci.h

View file

2

drivers/net/wireless/rtlwifi/rtl8192ce/hw.c

View file

9

drivers/net/wireless/rtlwifi/rtl8192cu/mac.c

View file

19

drivers/net/wireless/rtlwifi/rtl8192de/hw.c

View file

2

drivers/net/wireless/rtlwifi/rtl8192de/led.c

View file

30

drivers/net/wireless/rtlwifi/rtl8192de/phy.c

View file

16

drivers/net/wireless/rtlwifi/rtl8192de/rf.c

View file

6

drivers/net/wireless/rtlwifi/rtl8192de/trx.c

View file

3

drivers/net/wireless/rtlwifi/rtl8192se/hw.c

View file

2

drivers/net/wireless/wl12xx/Kconfig

View file

49

drivers/net/wireless/wl12xx/acx.c

View file

16

drivers/net/wireless/wl12xx/acx.h

View file

33

drivers/net/wireless/wl12xx/boot.c

View file

94

drivers/net/wireless/wl12xx/cmd.c

View file

62

drivers/net/wireless/wl12xx/cmd.h

View file

55

drivers/net/wireless/wl12xx/conf.h

View file

138

drivers/net/wireless/wl12xx/debugfs.c

View file

36

drivers/net/wireless/wl12xx/event.c

View file

3

drivers/net/wireless/wl12xx/ini.h

View file

19

drivers/net/wireless/wl12xx/init.c

View file

7

drivers/net/wireless/wl12xx/io.c

View file

14

drivers/net/wireless/wl12xx/io.h

View file

594

drivers/net/wireless/wl12xx/main.c

View file

12

drivers/net/wireless/wl12xx/ps.c

View file

39

drivers/net/wireless/wl12xx/rx.c

View file

12

drivers/net/wireless/wl12xx/rx.h

View file

63

drivers/net/wireless/wl12xx/scan.c

View file

17

drivers/net/wireless/wl12xx/scan.h

View file

71

drivers/net/wireless/wl12xx/sdio.c

View file

15

drivers/net/wireless/wl12xx/spi.c

View file

2

drivers/net/wireless/wl12xx/testmode.c

View file

33

drivers/net/wireless/wl12xx/tx.c

View file

38

drivers/net/wireless/wl12xx/wl12xx.h

View file

24

drivers/nfc/Kconfig

View file

3

drivers/nfc/Makefile

View file

1632

drivers/nfc/pn533.c

View file

9

drivers/ssb/pci.c

View file

126

include/linux/nfc.h

View file

39

include/linux/nl80211.h

View file

4

include/linux/socket.h

View file

2

include/linux/ssb/ssb.h

View file

26

include/net/cfg80211.h

View file

47

include/net/mac80211.h

View file

Some files were not shown because too many files have changed in this diff Show more