1
0
Fork 0
alistair23-linux/drivers/net/wireless/b43legacy
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
Makefile
b43legacy.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
debugfs.c net/wireless: use generic_file_llseek in debugfs 2010-09-16 10:33:08 +02:00
debugfs.h
dma.c b43legacy: replace the ssb_dma API with the generic DMA API 2010-06-04 16:00:42 -04:00
dma.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
ilt.c
ilt.h
leds.c
leds.h b43legacy: fix typo in ifdef comment 2010-02-15 16:12:53 -05:00
main.c drivers/net/wireless/b43legacy/main.c: Use printf extension %pV 2010-11-16 16:37:05 -05:00
main.h
phy.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
phy.h
pio.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pio.h
radio.c
radio.h
rfkill.c b43legacy: rfkill: use status register based on core revision (not PHY's) 2010-11-15 13:25:52 -05:00
rfkill.h
sysfs.c
sysfs.h
xmit.c b43legacy: remove usage of deprecated noise value 2010-04-28 16:48:21 -04:00
xmit.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00