1
0
Fork 0
alistair23-linux/drivers/net/wireless/wl1251
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
acx.c
acx.h Fix spelling mistakes in comments 2011-01-03 13:51:58 +01:00
boot.c wl1251: remove unnecessary import 2010-12-22 15:43:26 -05:00
boot.h
cmd.c
cmd.h
debugfs.c
debugfs.h
event.c
event.h
init.c
init.h
io.c
io.h
main.c wl1251: add power callback to wl1251_if_operations 2010-11-15 13:27:00 -05:00
ps.c
ps.h
reg.h
rx.c
rx.h
sdio.c wl1251: wl12xx_get_platform_data() returns an ERR_PTR 2010-12-20 14:49:49 -05:00
spi.c wl1251: add power callback to wl1251_if_operations 2010-11-15 13:27:00 -05:00
spi.h
tx.c
tx.h
wl12xx_80211.h
wl1251.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