1
linux/drivers/net/wan
Linus Torvalds 229aebb873 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: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
lmc
.gitignore
c101.c
cosa.c
cosa.h
cycx_drv.c
cycx_main.c
cycx_x25.c
dlci.c
dscc4.c
farsync.c
farsync.h
hd64570.c
hd64570.h
hd64572.c
hd64572.h
hdlc_cisco.c
hdlc_fr.c
hdlc_ppp.c
hdlc_raw_eth.c
hdlc_raw.c
hdlc_x25.c
hdlc.c
hostess_sv11.c
ixp4xx_hss.c
Kconfig
lapbether.c
Makefile
n2.c
pc300_drv.c
pc300_tty.c
pc300-falc-lh.h
pc300.h
pc300too.c
pci200syn.c
sbni.c
sbni.h
sdla.c
sealevel.c
wanxl.c
wanxl.h
wanxlfw.inc_shipped
wanxlfw.S
x25_asy.c
x25_asy.h
z85230.c
z85230.h