leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2bd93d7af1
linux/drivers/net/wireless/iwlwifi
History
David S. Miller 2bd93d7af1 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 
Resolved logic conflicts causing a build failure due to
drivers/net/r8169.c changes using a patch from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
2011-04-26 12:16:46 -07:00
..
iwl-1000.c iwlagn: remove un-necessary ieee80211_ops 2011-04-18 09:34:06 -07:00
iwl-2000.c iwlagn: remove un-necessary ieee80211_ops 2011-04-18 09:34:06 -07:00
iwl-5000-hw.h iwlagn: change Copyright to 2011 2011-04-07 15:51:37 -04:00
iwl-5000.c iwlagn: remove un-necessary ieee80211_ops 2011-04-18 09:34:06 -07:00
iwl-6000-hw.h iwlagn: change Copyright to 2011 2011-04-07 15:51:37 -04:00
iwl-6000.c iwlagn: remove un-necessary ieee80211_ops 2011-04-18 09:34:06 -07:00
iwl-agn-calib.c iwlagn: clean up & autodetect statistics 2011-04-08 08:19:00 -07:00
iwl-agn-calib.h iwlagn: clean up & autodetect statistics 2011-04-08 08:19:00 -07:00
iwl-agn-debugfs.c iwlagn: clean up & autodetect statistics 2011-04-08 08:19:00 -07:00
iwl-agn-debugfs.h iwlagn: change Copyright to 2011 2011-04-07 15:51:37 -04:00
iwl-agn-eeprom.c iwlagn: move IO functions out of line 2011-04-07 15:52:28 -04:00
iwl-agn-hcmd.c iwlagn: change Copyright to 2011 2011-04-07 15:51:37 -04:00
iwl-agn-hw.h iwlagn: change Copyright to 2011 2011-04-07 15:51:37 -04:00
iwl-agn-ict.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2011-04-12 16:18:44 -04:00
iwl-agn-lib.c iwlagn: clean up & autodetect statistics 2011-04-08 08:19:00 -07:00
iwl-agn-rs.c iwlagn: change Copyright to 2011 2011-04-07 15:51:37 -04:00
iwl-agn-rs.h iwlagn: no 3945 define needed 2011-04-08 08:00:19 -07:00
iwl-agn-rxon.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-04-26 12:16:46 -07:00
iwl-agn-sta.c iwlagn: change Copyright to 2011 2011-04-07 15:51:37 -04:00
iwl-agn-tt.c iwlagn: change Copyright to 2011 2011-04-07 15:51:37 -04:00
iwl-agn-tt.h iwlagn: change Copyright to 2011 2011-04-07 15:51:37 -04:00
iwl-agn-tx.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2011-04-26 12:16:46 -07:00
iwl-agn-ucode.c iwlagn: fix radar frame rejection 2011-04-08 07:59:37 -07:00
iwl-agn.c iwlagn: remove un-necessary ieee80211_ops 2011-04-18 09:34:06 -07:00
iwl-agn.h iwlagn: fix radar frame rejection 2011-04-08 07:59:37 -07:00
iwl-commands.h iwlagn: clean up & autodetect statistics 2011-04-08 08:19:00 -07:00
iwl-core.c iwlagn: remove un-necessary ieee80211_ops 2011-04-18 09:34:06 -07:00
iwl-core.h iwlagn: remove led_ops 2011-04-18 09:36:30 -07:00
iwl-csr.h iwlagn: change Copyright to 2011 2011-04-07 15:51:37 -04:00
iwl-debug.h iwlagn: move IO functions out of line 2011-04-07 15:52:28 -04:00
iwl-debugfs.c iwlagn: always support uCode trace 2011-04-18 09:27:30 -07:00
iwl-dev.h iwlagn: clean up & autodetect statistics 2011-04-08 08:19:00 -07:00
iwl-devtrace.c iwlagn: change Copyright to 2011 2011-04-07 15:51:37 -04:00
iwl-devtrace.h iwlagn: change Copyright to 2011 2011-04-07 15:51:37 -04:00
iwl-eeprom.c iwlagn: remove most BUG_ON instances 2011-04-18 09:14:30 -07:00
iwl-eeprom.h iwlagn: remove most BUG_ON instances 2011-04-18 09:14:30 -07:00
iwl-fh.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2011-04-25 14:34:25 -04:00
iwl-hcmd.c iwlagn: remove most BUG_ON instances 2011-04-18 09:14:30 -07:00
iwl-helpers.h iwlagn: fix radar frame rejection 2011-04-08 07:59:37 -07:00
iwl-io.c iwlagn: move IO functions out of line 2011-04-07 15:52:28 -04:00
iwl-io.h iwlagn: move IO functions out of line 2011-04-07 15:52:28 -04:00
iwl-led.c iwlagn: use direct call for led functions 2011-04-18 08:47:43 -07:00
iwl-led.h iwlagn: use direct call for led functions 2011-04-18 08:47:43 -07:00
iwl-power.c iwlagn: temperature should be measure for all _agn devices 2011-04-18 09:30:09 -07:00
iwl-power.h iwlagn: change Copyright to 2011 2011-04-07 15:51:37 -04:00
iwl-prph.h iwlagn: more cleanup to remove unused reference 2011-04-08 08:01:37 -07:00
iwl-rx.c iwlagn: clean up & autodetect statistics 2011-04-08 08:19:00 -07:00
iwl-scan.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2011-04-12 16:18:44 -04:00
iwl-spectrum.h iwlagn: change Copyright to 2011 2011-04-07 15:51:37 -04:00
iwl-sta.c iwlagn: remove most BUG_ON instances 2011-04-18 09:14:30 -07:00
iwl-sta.h iwlagn: change Copyright to 2011 2011-04-07 15:51:37 -04:00
iwl-tx.c iwlagn: temperature should be measure for all _agn devices 2011-04-18 09:30:09 -07:00
Kconfig iwlwifi: split the drivers for agn and legacy devices 3945/4965 2011-02-21 11:27:26 -08:00
Makefile iwlagn: use direct call for led functions 2011-04-18 08:47:43 -07:00