forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
linux-pinenote/drivers/net/wireless/wl12xx
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
..
acx.c wl12xx: add auto-arp support 2010-12-15 15:04:56 +02:00
acx.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
boot.c wl12xx: remove unnecessary import 2010-12-22 15:43:26 -05:00
boot.h wl1271: Add wl1271_load_firmware() and export some functions 2010-12-02 16:17:20 +02:00
cmd.c wl12xx: add auto-arp support 2010-12-15 15:04:56 +02:00
cmd.h wl12xx: add auto-arp support 2010-12-15 15:04:56 +02:00
conf.h wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
debugfs.c wl12xx: Change TX queue to be per AC 2010-12-15 15:41:37 +02:00
debugfs.h wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
event.c wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
event.h wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
ini.h wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
init.c wl1271: fixed problem with WPS IEs in probe requests 2010-12-15 15:41:04 +02:00
init.h wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
io.c wl1271: Add wl1271_load_firmware() and export some functions 2010-12-02 16:17:20 +02:00
io.h wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
Kconfig wl12xx_sdio_test: rename files to match current style 2010-12-15 17:09:27 +02:00
main.c wl12xx: Change TX queue to be per AC 2010-12-15 15:41:37 +02:00
Makefile wl12xx_sdio_test: rename files to match current style 2010-12-15 17:09:27 +02:00
ps.c wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
ps.h wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
reg.h wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
rx.c wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
rx.h wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
scan.c wl1271: Fix setting of the hardware connection monitoring probe-req template 2010-11-26 15:33:41 +02:00
scan.h wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
sdio.c wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
sdio_test.c wl12xx_sdio_test: rename files to match current style 2010-12-15 17:09:27 +02:00
spi.c wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
testmode.c wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
testmode.h wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
tx.c wl12xx: Change TX queue to be per AC 2010-12-15 15:41:37 +02:00
tx.h wl1271: Change wl12xx Files Names 2010-11-22 16:45:09 +02:00
wl12xx.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
wl12xx_80211.h wl1271: fixed problem with WPS IEs in probe requests 2010-12-15 15:41:04 +02:00
wl12xx_platform_data.c wl12xx: add platform data passing support 2010-09-21 11:04:57 -04:00