1
0
Fork 0
alistair23-linux/drivers/net/wan
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
..
lmc drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
.gitignore
Kconfig Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
Makefile
c101.c drivers/net/wan: Adjust confusing if indentation 2010-08-16 21:06:25 -07:00
cosa.c net: Wan/cosa.c: Convert "mutex" to semaphore 2010-10-12 17:36:09 +02:00
cosa.h
cycx_drv.c wan: make read-only data const 2010-09-06 13:32:20 -07:00
cycx_main.c wan: make read-only data const 2010-09-06 13:32:20 -07:00
cycx_x25.c
dlci.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
dscc4.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
farsync.c farsync: Fix compile warnings. 2010-08-10 00:06:58 -07:00
farsync.h
hd64570.c
hd64570.h
hd64572.c WAN: Fix a TX IRQ causing BUG() in PC300 and PCI200SYN drivers. 2010-12-12 15:03:00 -08:00
hd64572.h
hdlc.c Fix typo interrest[ing|ed] => interest[ing|ed] 2010-09-21 17:05:44 +02:00
hdlc_cisco.c ipv4: ip_ptr cleanups 2010-09-15 22:06:05 -07:00
hdlc_fr.c
hdlc_ppp.c
hdlc_raw.c
hdlc_raw_eth.c
hdlc_x25.c
hostess_sv11.c
ixp4xx_hss.c Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 2010-08-11 09:17:27 -07:00
lapbether.c wan: make read-only data const 2010-09-06 13:32:20 -07:00
n2.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
pc300-falc-lh.h
pc300.h
pc300_drv.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
pc300_tty.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
pc300too.c
pci200syn.c drivers/net/wan: Adjust confusing if indentation 2010-08-16 21:06:25 -07:00
sbni.c
sbni.h
sdla.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
sealevel.c
wanxl.c
wanxl.h
wanxlfw.S
wanxlfw.inc_shipped
x25_asy.c Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 2010-12-02 12:58:16 -08:00
x25_asy.h
z85230.c wan: make read-only data const 2010-09-06 13:32:20 -07:00
z85230.h