OpenCloudOS-Kernel/drivers/net/tulip
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
..
21142.c tulip/21142.c: Use dev_<level> and pr_<level> 2010-01-31 23:26:52 -08:00
Kconfig Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
Makefile
de4x5.c drivers-net-tulip-de4x5c-fix-copy-length-in-de4x5_ioctl-checkpatch-fixes 2010-10-03 21:59:39 -07:00
de4x5.h de4x5: Remove developer debug feature about set/clear promisc 2008-07-22 16:09:09 -04:00
de2104x.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-10-04 11:56:38 -07:00
dmfe.c drivers/net: Remove address use from assignments of function pointers 2010-08-25 15:35:43 -07:00
eeprom.c drivers/net/tulip/eeprom.c: Remove unnecessary kmalloc casts 2010-06-01 00:15:53 -07:00
interrupt.c tulip: use integrated netdev stats 2010-09-03 09:44:51 -07:00
media.c drivers/net: Remove unnecessary returns from void function()s 2010-05-14 00:19:28 -07:00
pnic.c net: trans_start cleanups 2010-05-10 05:01:31 -07:00
pnic2.c fix printk typo 'faild' 2010-08-09 11:25:17 +02:00
timer.c tulip/timer.c: Use dev_<level> and pr_<level> 2010-01-31 23:26:56 -08:00
tulip.h tulip: use integrated netdev stats 2010-09-03 09:44:51 -07:00
tulip_core.c tulip: use integrated netdev stats 2010-09-03 09:44:51 -07:00
uli526x.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
winbond-840.c drivers/net: Remove address use from assignments of function pointers 2010-08-25 15:35:43 -07:00
xircom_cb.c ethtool: Provide a default implementation of ethtool_ops::get_drvinfo 2010-08-17 02:31:15 -07:00