2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
linux-next/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 drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
.gitignore
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
farsync.c farsync: Fix compile warnings. 2010-08-10 00:06:58 -07:00
farsync.h
hd64570.c
hd64570.h drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
hd64572.c
hd64572.h
hdlc_cisco.c ipv4: ip_ptr cleanups 2010-09-15 22:06:05 -07:00
hdlc_fr.c drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
hdlc_ppp.c
hdlc_raw_eth.c
hdlc_raw.c
hdlc_x25.c
hdlc.c Fix typo interrest[ing|ed] => interest[ing|ed] 2010-09-21 17:05:44 +02:00
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
Kconfig Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
lapbether.c wan: make read-only data const 2010-09-06 13:32:20 -07:00
Makefile
n2.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
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
pc300-falc-lh.h
pc300.h
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.inc_shipped
wanxlfw.S
x25_asy.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
x25_asy.h
z85230.c wan: make read-only data const 2010-09-06 13:32:20 -07:00
z85230.h