linux/drivers/net/wireless
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
..
ath Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
b43 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
b43legacy Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
hostap Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-12-26 22:37:05 -08:00
ipw2x00 libipw: fix proc entry removal 2010-11-08 16:32:38 -05:00
iwlwifi Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
iwmc3200wifi cfg80211/nl80211: separate unicast/multicast default TX keys 2010-12-13 15:23:28 -05:00
libertas libertas: down_interruptible() can return -EINTR, not EINTR 2011-01-04 14:46:56 -05:00
libertas_tf
orinoco Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-12-26 22:37:05 -08:00
p54 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-12-17 12:27:22 -08:00
prism54 tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
rt2x00 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
rtl818x rtl818x: move rtl8180 and rtl8187 to separate subdirectories 2010-12-22 13:45:32 -05:00
rtlwifi rtlwifi: Fix large packet issue 2010-12-22 15:45:52 -05:00
wl12xx Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
wl1251 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
zd1211rw Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2011-01-07 16:58:04 -08:00
Kconfig rtl8192ce: Add new driver 2010-12-15 16:17:49 -05:00
Makefile rtl8192ce: Add new driver 2010-12-15 16:17:49 -05:00
adm8211.c
adm8211.h
airo.c airo: use simple_write_to_buffer 2011-01-04 14:35:12 -05:00
airo.h
airo_cs.c
at76c50x-usb.c WIRELESS: at76c50x, remove unneeded NULL check 2010-10-11 15:04:25 -04:00
at76c50x-usb.h
atmel.c atmel: Use static const 2010-11-22 15:58:46 -05:00
atmel.h
atmel_cs.c
atmel_pci.c
mac80211_hwsim.c mac80211_hwsim: Incorporate txpower into rssi 2010-11-15 13:25:28 -05:00
mwl8k.c mwl8k: use const struct fw pointers throughout 2010-11-16 16:37:03 -05:00
ray_cs.c wireless: ray_cs: use '%pm' format option to print MAC 2010-12-02 15:17:00 -05:00
ray_cs.h
rayctl.h
rndis_wlan.c rndis_wlan: add support for set_power_mgmt 2010-12-22 15:43:31 -05:00
wl3501.h
wl3501_cs.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
zd1201.c wireless: Remove unnecessary casts of usb_get_intfdata 2010-12-02 15:16:47 -05:00
zd1201.h