linux/drivers/net/wireless/b43
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
..
b43.h b43: rename TMS defines, drop useless condition from core reset 2010-12-13 15:23:29 -05:00
debugfs.c net/wireless: use generic_file_llseek in debugfs 2010-09-16 10:33:08 +02:00
debugfs.h
dma.c b43: remove extraneous code in free_ringmemory 2010-11-15 13:24:38 -05:00
dma.h
Kconfig b43: rename config option for N-PHY, drop BROKEN 2010-12-08 15:38:45 -05:00
leds.c
leds.h
lo.c
lo.h
main.c b43: N-PHY: enable support for PHYs rev 3 and higher 2010-12-22 15:43:30 -05:00
main.h
Makefile b43: rename config option for N-PHY, drop BROKEN 2010-12-08 15:38:45 -05:00
pcmcia.c pcmcia: move driver name to struct pcmcia_driver 2010-09-29 17:20:24 +02:00
pcmcia.h
phy_a.c
phy_a.h
phy_common.c b43: rename config option for N-PHY, drop BROKEN 2010-12-08 15:38:45 -05:00
phy_common.h b43: set TMS to work with current band width for N-PHY 2010-12-08 15:38:45 -05:00
phy_g.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
phy_g.h
phy_lp.c
phy_lp.h
phy_n.c b43: N-PHY: update 2056 radio on channel switch on rev3+ 2010-12-22 15:43:29 -05:00
phy_n.h b43: N-PHY: implement very basic TX power control management 2010-12-02 14:37:01 -05:00
pio.c
pio.h
radio_2055.c b43: N-PHY: swap values for radio registers 0x3b and 0x3c 2010-12-02 14:37:01 -05:00
radio_2055.h b43: N-PHY: put radio-specific code in separated file 2010-10-15 15:57:38 -04:00
radio_2056.c b43: N-PHY: use correct channel tables for rev4+ 2010-12-22 15:43:29 -05:00
radio_2056.h b43: N-PHY: implement radio 2056 init steps 2010-12-22 15:43:29 -05:00
rfkill.c b43: rfkill: use HI enabled bit for all devices 2010-11-22 15:48:50 -05:00
rfkill.h
sdio.c wireless: b43: fix error path in SDIO 2010-11-23 15:00:51 -05:00
sdio.h
sysfs.c
sysfs.h
tables_lpphy.c
tables_lpphy.h
tables_nphy.c b43: N-PHY: one more fix for order of tables initialization 2010-12-13 15:23:29 -05:00
tables_nphy.h b43: N-PHY: put 2056-radio's specific code in separated file 2010-10-15 15:57:40 -04:00
tables.c
tables.h
wa.c
wa.h
xmit.c
xmit.h