kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-10-14 05:55:17 +00:00
Code Issues Releases Packages Activity

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Browse source 
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-eeprom.c
This commit is contained in:
John W. Linville 2012-06-11 14:50:59 -04:00
commit b6038961df
89 changed files with 36646 additions and 36870 deletions
Download patch file Download diff file Expand all files Collapse all files

26
drivers/net/wireless/iwlwifi/Makefile
View file

13
drivers/net/wireless/iwlwifi/dvm/Makefile
View file

94
drivers/net/wireless/iwlwifi/iwl-agn.h → drivers/net/wireless/iwlwifi/dvm/agn.h
View file

24
drivers/net/wireless/iwlwifi/iwl-agn-calib.c → drivers/net/wireless/iwlwifi/dvm/calib.c
View file

4
drivers/net/wireless/iwlwifi/iwl-agn-calib.h → drivers/net/wireless/iwlwifi/dvm/calib.h
View file

4
drivers/net/wireless/iwlwifi/iwl-commands.h → drivers/net/wireless/iwlwifi/dvm/commands.h
View file

31
drivers/net/wireless/iwlwifi/iwl-debugfs.c → drivers/net/wireless/iwlwifi/dvm/debugfs.c
View file

148
drivers/net/wireless/iwlwifi/iwl-dev.h → drivers/net/wireless/iwlwifi/dvm/dev.h
View file

178
drivers/net/wireless/iwlwifi/iwl-agn-devices.c → drivers/net/wireless/iwlwifi/dvm/devices.c
View file

5
drivers/net/wireless/iwlwifi/iwl-led.c → drivers/net/wireless/iwlwifi/dvm/led.c
View file

0
drivers/net/wireless/iwlwifi/iwl-led.h → drivers/net/wireless/iwlwifi/dvm/led.h
View file

18
drivers/net/wireless/iwlwifi/iwl-agn-lib.c → drivers/net/wireless/iwlwifi/dvm/lib.c
View file

133
drivers/net/wireless/iwlwifi/iwl-mac80211.c → drivers/net/wireless/iwlwifi/dvm/mac80211.c
View file

408
drivers/net/wireless/iwlwifi/iwl-agn.c → drivers/net/wireless/iwlwifi/dvm/main.c
View file

11
drivers/net/wireless/iwlwifi/iwl-power.c → drivers/net/wireless/iwlwifi/dvm/power.c
View file

2
drivers/net/wireless/iwlwifi/iwl-power.h → drivers/net/wireless/iwlwifi/dvm/power.h
View file

50
drivers/net/wireless/iwlwifi/iwl-agn-rs.c → drivers/net/wireless/iwlwifi/dvm/rs.c
View file

3
drivers/net/wireless/iwlwifi/iwl-agn-rs.h → drivers/net/wireless/iwlwifi/dvm/rs.h
View file

10
drivers/net/wireless/iwlwifi/iwl-agn-rx.c → drivers/net/wireless/iwlwifi/dvm/rx.c
View file

52
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c → drivers/net/wireless/iwlwifi/dvm/rxon.c
View file

111
drivers/net/wireless/iwlwifi/iwl-scan.c → drivers/net/wireless/iwlwifi/dvm/scan.c
View file

61
drivers/net/wireless/iwlwifi/iwl-agn-sta.c → drivers/net/wireless/iwlwifi/dvm/sta.c
View file

21
drivers/net/wireless/iwlwifi/iwl-testmode.c → drivers/net/wireless/iwlwifi/dvm/testmode.c
View file

0
drivers/net/wireless/iwlwifi/iwl-testmode.h → drivers/net/wireless/iwlwifi/dvm/testmode.h
View file

13
drivers/net/wireless/iwlwifi/iwl-agn-tt.c → drivers/net/wireless/iwlwifi/dvm/tt.c
View file

2
drivers/net/wireless/iwlwifi/iwl-agn-tt.h → drivers/net/wireless/iwlwifi/dvm/tt.h
View file

58
drivers/net/wireless/iwlwifi/iwl-agn-tx.c → drivers/net/wireless/iwlwifi/dvm/tx.c
View file

34
drivers/net/wireless/iwlwifi/iwl-ucode.c → drivers/net/wireless/iwlwifi/dvm/ucode.c
View file

26
drivers/net/wireless/iwlwifi/iwl-config.h
View file

28
drivers/net/wireless/iwlwifi/iwl-csr.h
View file

5
drivers/net/wireless/iwlwifi/iwl-debug.h
View file

1
drivers/net/wireless/iwlwifi/iwl-devtrace.h
View file

900
drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
View file

138
drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h
View file

463
drivers/net/wireless/iwlwifi/iwl-eeprom-read.c
View file

70
drivers/net/wireless/iwlwifi/iwl-eeprom-read.h
View file

1148
drivers/net/wireless/iwlwifi/iwl-eeprom.c
View file

269
drivers/net/wireless/iwlwifi/iwl-eeprom.h
View file

18
drivers/net/wireless/iwlwifi/iwl-io.c
View file

2
drivers/net/wireless/iwlwifi/iwl-io.h
View file

5
drivers/net/wireless/iwlwifi/iwl-op-mode.h
View file

2
drivers/net/wireless/iwlwifi/iwl-prph.h
View file

51
drivers/net/wireless/iwlwifi/iwl-trans.h
View file

19
drivers/net/wireless/iwlwifi/iwl-1000.c → drivers/net/wireless/iwlwifi/pcie/1000.c
View file

22
drivers/net/wireless/iwlwifi/iwl-2000.c → drivers/net/wireless/iwlwifi/pcie/2000.c
View file

20
drivers/net/wireless/iwlwifi/iwl-5000.c → drivers/net/wireless/iwlwifi/pcie/5000.c
View file

24
drivers/net/wireless/iwlwifi/iwl-6000.c → drivers/net/wireless/iwlwifi/pcie/6000.c
View file

0
drivers/net/wireless/iwlwifi/iwl-cfg.h → drivers/net/wireless/iwlwifi/pcie/cfg.h
View file

5
drivers/net/wireless/iwlwifi/iwl-pci.c → drivers/net/wireless/iwlwifi/pcie/drv.c
View file

9
drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h → drivers/net/wireless/iwlwifi/pcie/internal.h
View file

2
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c → drivers/net/wireless/iwlwifi/pcie/rx.c
View file

89
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c → drivers/net/wireless/iwlwifi/pcie/trans.c
View file

54
drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c → drivers/net/wireless/iwlwifi/pcie/tx.c
View file