leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b83b2f295a
linux/drivers/net/wireless/iwlwifi
History
Linus Torvalds 008d23e485 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
2011-01-13 10:05:56 -08:00
..
iwl3945-base.c iwlwifi: jiffies based tx queues watchdog 2010-12-06 16:01:29 -05:00
iwl-1000.c iwlagn: code clean up to remove duplicate code 2010-12-13 15:53:54 -08:00
iwl-3945-debugfs.c
iwl-3945-debugfs.h
iwl-3945-fh.h
iwl-3945-hw.h
iwl-3945-led.c
iwl-3945-led.h
iwl-3945-rs.c
iwl-3945.c iwlwifi: jiffies based tx queues watchdog 2010-12-06 16:01:29 -05:00
iwl-3945.h iwlagn: new RXON processing for modern devices 2010-11-15 13:24:53 -05:00
iwl-4965-hw.h
iwl-4965.c iwlwifi: jiffies based tx queues watchdog 2010-12-06 16:01:29 -05:00
iwl-5000-hw.h
iwl-5000.c iwlagn: code clean up to remove duplicate code 2010-12-13 15:53:54 -08:00
iwl-6000-hw.h
iwl-6000.c iwlagn: fix scan tx antenna setting on 5Ghz band 2011-01-04 14:35:11 -05:00
iwl-agn-calib.c iwlwifi: disable disconnected antenna for advanced bt coex 2010-11-15 13:26:57 -05:00
iwl-agn-calib.h
iwl-agn-debugfs.c iwlwifi: keep track of bt coex enable/disable stage 2010-12-13 15:53:38 -08:00
iwl-agn-debugfs.h
iwl-agn-eeprom.c iwlagn: More detail tx power logging 2010-12-13 15:53:09 -08:00
iwl-agn-hcmd.c iwlagn: fix PAN slot timing wrt. DTIM 2010-11-16 07:46:49 -08:00
iwl-agn-hw.h
iwl-agn-ict.c wireless: comment typo fix diable -> disable. 2011-01-03 16:05:53 +01:00
iwl-agn-led.c
iwl-agn-led.h
iwl-agn-lib.c iwlagn: fix scan tx antenna setting on 5Ghz band 2011-01-04 14:35:11 -05:00
iwl-agn-rs.c iwlwifi: Fix error: struct iwl_lq_sta has no member named dbg_fixed_rate 2010-12-16 09:47:02 -05:00
iwl-agn-rs.h
iwl-agn-rx.c
iwl-agn-rxon.c iwlagn: fix witespace damage 2010-12-15 17:03:55 -05:00
iwl-agn-sta.c iwlagn: fix non-5000+ build 2010-11-15 13:26:43 -05:00
iwl-agn-tt.c
iwl-agn-tt.h
iwl-agn-tx.c iwlagn: fix debug variable access 2010-12-13 15:51:33 -08:00
iwl-agn-ucode.c iwlagn: Enable PCI L1 ACTIVE state after uCode has been loaded 2010-12-02 08:35:02 -08:00
iwl-agn.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
iwl-agn.h iwlagn: remove structure name reference to gen2 2010-12-02 08:35:12 -08:00
iwl-commands.h iwlagn: use different kill mask when SCO active 2010-11-24 17:25:03 -08:00
iwl-core.c wireless: comment typo fix diable -> disable. 2011-01-03 16:05:53 +01:00
iwl-core.h iwlagn: fix scan tx antenna setting on 5Ghz band 2011-01-04 14:35:11 -05:00
iwl-csr.h iwlagn: enable shadow register 2010-11-15 13:26:59 -05:00
iwl-debug.h iwlwifi: add new EEPROM debug log type 2010-12-13 15:52:39 -08:00
iwl-debugfs.c iwlwifi: keep track of bt coex enable/disable stage 2010-12-13 15:53:38 -08:00
iwl-dev.h iwlwifi: keep track of bt coex enable/disable stage 2010-12-13 15:53:38 -08:00
iwl-devtrace.c
iwl-devtrace.h
iwl-eeprom.c iwlwifi: use IWL_DEBUG_EEPROM for EEPROM related info 2010-12-13 15:52:53 -08:00
iwl-eeprom.h iwlagn: remove old EEPROM TX power reading 2010-12-13 15:52:23 -08:00
iwl-fh.h
iwl-hcmd.c
iwl-helpers.h Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 2011-01-05 14:35:41 -05:00
iwl-io.h
iwl-led.c iwlwifi: remove extra string 2010-12-26 10:01:04 -08:00
iwl-led.h iwlwifi: change default led mode for different devices 2010-11-16 07:44:24 -08:00
iwl-legacy.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
iwl-legacy.h iwlwifi: legacy tx_cmd_protection function 2010-11-15 13:26:47 -05:00
iwl-power.c iwlwifi: advance power management support 2010-11-24 16:19:37 -05:00
iwl-power.h iwlwifi: defer update power mode while scan 2010-11-15 13:24:28 -05:00
iwl-prph.h iwlwifi: do not reload fw if WiMAX own the RF 2010-12-13 15:53:24 -08:00
iwl-rx.c iwlagn: enable shadow register 2010-11-15 13:26:59 -05:00
iwl-scan.c iwlwifi: kill elapsed_jiffies 2010-11-16 16:39:09 -05:00
iwl-spectrum.h
iwl-sta.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
iwl-sta.h iwlagn: reprogram AP STA after assoc 2010-11-16 07:46:35 -08:00
iwl-tx.c iwlwifi: jiffies based tx queues watchdog 2010-12-06 16:01:29 -05:00
Kconfig iwlwifi: add new devices to Kconfig 2010-11-15 13:24:58 -05:00
Makefile iwlwifi: fix modular 3945 only build 2010-11-22 15:48:51 -05:00