alistair23-linux/drivers/net/wireless/ath/ath5k
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
..
ahb.c ath5k: Add AHB bus support. 2010-12-02 15:17:51 -05:00
ani.c ath5k: Reset cleanup and generic cleanup 2010-11-30 13:52:29 -05:00
ani.h ath5k: use the common cycle counter / listen time implementation 2010-10-11 15:04:20 -04:00
ath5k.h ath5k: Use helper function to get eeprom mode from channel 2010-12-22 15:43:28 -05:00
attach.c ath5k: Use pci_is_pcie() 2010-12-22 15:43:26 -05:00
base.c ath5k: qualify global modparam_nohwcrypt variable 2011-01-05 14:36:27 -05:00
base.h ath5k: Fix survey 2010-12-16 15:22:32 -05:00
caps.c ath5k: Clean up turbo mode initvals/rfregs 2010-11-30 13:53:45 -05:00
debug.c ath: Convert ath_print to ath_dbg 2010-12-07 16:34:48 -05:00
debug.h ath5k: Debug DMA timeouts 2010-11-30 13:52:31 -05:00
desc.c ath5k: Reset cleanup and generic cleanup 2010-11-30 13:52:29 -05:00
desc.h ath5k: Optimize descriptor alignment 2010-11-09 16:13:26 -05:00
dma.c ath5k: Fix reporting of RX dma stop failure 2010-12-06 16:01:27 -05:00
eeprom.c ath5k: Use helper function to get eeprom mode from channel 2010-12-22 15:43:28 -05:00
eeprom.h ath5k: Use helper function to get eeprom mode from channel 2010-12-22 15:43:28 -05:00
gpio.c ath5k: remove ATH_TRACE macro 2010-06-02 16:13:24 -04:00
initvals.c ath5k: Add initial registers values for radio RF2317 chip. 2010-12-02 15:17:51 -05:00
Kconfig ath5k: Add AHB bus support. 2010-12-02 15:17:51 -05:00
led.c ath5k: Add AHB bus support. 2010-12-02 15:17:51 -05:00
mac80211-ops.c ath5k: qualify global modparam_nohwcrypt variable 2011-01-05 14:36:27 -05:00
Makefile ath5k: Move mac80211 functions into new file 2011-01-04 14:35:11 -05:00
pci.c ath5k: Fix modinfo does not list alias -> pci-id lines 2010-12-09 08:53:42 -05:00
pcu.c ath5k: Always set IFS intervals on reset 2010-11-30 13:53:22 -05:00
phy.c ath5k: ath5k_eeprom_mode_from_channel() returns signed 2011-01-04 14:46:13 -05:00
qcu.c ath5k: Use capabilities information for the number of TX queues 2010-12-07 17:07:54 -05:00
reg.h Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
reset.c ath5k: Use helper function to get eeprom mode from channel 2010-12-22 15:43:28 -05:00
rfbuffer.h ath5k: Set turbo bit on rf bank 2 2010-11-30 13:53:45 -05:00
rfgain.h
rfkill.c
sysfs.c ath5k: Check if pci pdev struct is initialized in common functions. 2010-12-02 15:17:50 -05:00