Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-21 10:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
008d23e485
linux/drivers/net/wireless/rt2x00
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
..
Kconfig Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem 2010-11-24 16:49:20 -05:00
Makefile
rt2x00.h rt2x00: Remove unused interface spinlock 2011-01-04 14:35:15 -05:00
rt2x00config.c rt2x00: Fix pointer errors. 2011-01-04 14:35:14 -05:00
rt2x00crypto.c
rt2x00debug.c rt2x00: Protect queue control with mutex 2010-12-13 15:23:35 -05:00
rt2x00debug.h
rt2x00dev.c rt2x00: Simplify intf->delayed_flags locking 2011-01-04 14:35:14 -05:00
rt2x00dump.h
rt2x00firmware.c
rt2x00ht.c rt2x00: Remove superfluous assignment of mpdu_density 2011-01-04 14:35:14 -05:00
rt2x00leds.c
rt2x00leds.h
rt2x00lib.h rt2x00: Protect queue control with mutex 2010-12-13 15:23:35 -05:00
rt2x00link.c rt2x00: checkpatch.pl error fixes for rt2x00link.c 2010-11-15 13:26:28 -05:00
rt2x00mac.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
rt2x00pci.c rt2x00: Use pci_is_pcie() 2010-12-22 15:43:26 -05:00
rt2x00pci.h rt2x00: Fix firmware loading regression on x86_64. 2010-12-13 15:23:37 -05:00
rt2x00queue.c rt2x00: Fix WMM Queue naming 2010-12-13 15:23:36 -05:00
rt2x00queue.h rt2x00: Fix WMM Queue naming 2010-12-13 15:23:36 -05:00
rt2x00reg.h rt2x00: Reorganize queue callback functions 2010-12-13 15:23:35 -05:00
rt2x00soc.c rt2x00: Use ioremap for SoC devices instead of KSEG1ADDR. 2010-11-17 16:18:54 -05:00
rt2x00soc.h
rt2x00usb.c rt2x00: Fix WMM Queue naming 2010-12-13 15:23:36 -05:00
rt2x00usb.h rt2x00: Add "flush" queue command 2010-12-13 15:23:35 -05:00
rt61pci.c rt2x00: Pad beacon to multiple of 32 bits. 2010-12-13 15:23:36 -05:00
rt61pci.h rt2x00: Fix WMM Queue naming 2010-12-13 15:23:36 -05:00
rt73usb.c rt2x00: Pad beacon to multiple of 32 bits. 2010-12-13 15:23:36 -05:00
rt73usb.h rt2x00: Fix WMM Queue naming 2010-12-13 15:23:36 -05:00
rt2400pci.c rt2x00: Fix WMM Queue naming 2010-12-13 15:23:36 -05:00
rt2400pci.h rt2x00: checkpatch.pl error fixes for rt2400pci.h 2010-11-15 13:26:13 -05:00
rt2500pci.c rt2x00: Fix WMM Queue naming 2010-12-13 15:23:36 -05:00
rt2500pci.h rt2x00: checkpatch.pl error fixes for rt2500pci.h 2010-11-15 13:26:15 -05:00
rt2500usb.c rt2x00: Add "flush" queue command 2010-12-13 15:23:35 -05:00
rt2500usb.h
rt2800.h rt2x00: Fix WMM Queue naming 2010-12-13 15:23:36 -05:00
rt2800lib.c rt2x00: Pad beacon to multiple of 32 bits. 2010-12-13 15:23:36 -05:00
rt2800lib.h rt2x00: Implement get_survey callback for rt2800 2010-12-13 15:23:34 -05:00
rt2800pci.c rt2x00: simplify txstatus_fifo handling 2011-01-04 14:35:13 -05:00
rt2800pci.h rt2x00: checkpatch.pl error fixes for rt2800pci.h 2010-11-15 13:26:20 -05:00
rt2800usb.c rt2x00: Fix panic on frame padding for rt2800 usb devices 2011-01-04 14:35:14 -05:00
rt2800usb.h rt2x00: checkpatch.pl error fixes for rt2800usb.h 2010-11-15 13:26:23 -05:00