UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/net/usb
History
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
..
Kconfig introduce cx82310_eth: Conexant CX82310-based ADSL router USB ethernet driver 2010-09-08 13:10:53 -07:00
Makefile introduce cx82310_eth: Conexant CX82310-based ADSL router USB ethernet driver 2010-09-08 13:10:53 -07:00
asix.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-06-11 13:32:31 -07:00
catc.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
cdc-phonet.c usbnet: remove direct access to urb->status 2010-07-05 18:50:55 -07:00
cdc_eem.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
cdc_ether.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-05-02 22:02:06 -07:00
cdc_subset.c
…
cx82310_eth.c cx82310_eth: allow empty URBs 2010-09-13 20:02:53 -07:00
dm9601.c drivers/net/usb: Use kmemdup 2010-05-17 17:44:48 -07:00
gl620a.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hso.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-10-23 11:47:02 -07:00
int51x1.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ipheth.c ipheth: remove incorrect devtype to WWAN 2010-09-09 21:41:59 -07:00
kaweth.c ethtool: Provide a default implementation of ethtool_ops::get_drvinfo 2010-08-17 02:31:15 -07:00
mcs7830.c drivers/net/usb: Use kmemdup 2010-05-17 17:44:47 -07:00
net1080.c drivers/net: use __packed annotation 2010-06-03 03:18:23 -07:00
pegasus.c usb: pegasus: fixed coding style issues 2010-06-30 10:26:16 -07:00
pegasus.h usb: pegasus: fixed coding style issues 2010-06-30 10:26:16 -07:00
plusb.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
rndis_host.c net: Revert "rndis_host: Poll status channel before control channel" 2010-07-02 21:47:54 -07:00
rtl8150.c net: use netdev_mc_count and netdev_mc_empty when appropriate 2010-02-12 11:38:58 -08:00
sierra_net.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
smsc75xx.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
smsc75xx.h smsc75xx: SMSC LAN75xx USB gigabit ethernet adapter driver 2010-03-16 14:15:42 -07:00
smsc95xx.c smsc95xx: generate random MAC address once, not every ifup 2010-10-21 03:09:48 -07:00
smsc95xx.h
…
usbnet.c usbnet: rx_submit() should return an error code. 2010-08-10 02:50:55 -07:00
zaurus.c drivers/net: Move && and || to end of previous line 2009-12-03 13:18:01 -08:00