linux/drivers/net/tokenring
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
..
3c359.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
3c359.h 3C359: use request_firmware 2009-03-30 20:02:50 +05:30
abyss.c drivers/net/: use DEFINE_PCI_DEVICE_TABLE() 2010-01-07 23:54:26 -08:00
abyss.h MAINTAINERS: remove Adam Fritzler, remove his email address in other sources 2008-02-03 16:36:24 +02:00
ibmtr.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
Kconfig net: Allow dependancies of FDDI & Tokenring to be modular. 2008-12-27 20:43:48 -08:00
lanstreamer.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
lanstreamer.h lanstreamer: convert to internal network stats 2009-01-21 14:02:27 -08:00
madgemc.c drivers/net: Remove unnecessary returns from void function()s 2010-05-14 00:19:28 -07:00
madgemc.h MAINTAINERS: remove Adam Fritzler, remove his email address in other sources 2008-02-03 16:36:24 +02:00
Makefile
olympic.c net: convert multicast list to list_head 2010-04-03 14:22:15 -07:00
olympic.h olympic: convert to internal network device stats 2009-01-21 14:02:29 -08:00
proteon.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
skisa.c tokenring: convert drivers to net_device_ops 2009-03-27 00:46:43 -07:00
smctr.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
smctr.h drivers/net/tokenring: fix sparse warning: cast truncates bits from const value 2009-02-17 19:49:21 -08:00
tms380tr.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
tms380tr.h tms380tr: convert to net_device_ops 2009-01-21 14:02:30 -08:00
tmspci.c tmspci: fix tr%d in printk 2010-09-21 18:04:44 -07:00