OpenCloudOS-Kernel/drivers/usb/mon
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 USB: usbmon: drop Kconfig defaults 2009-09-23 06:46:19 -07:00
Makefile usb: makefile cleanup 2010-10-22 10:22:07 -07:00
mon_bin.c USB: resizing usbmon binary interface buffer causes protection faults 2010-08-10 14:35:41 -07:00
mon_main.c drivers/usb: Remove unnecessary return's from void functions 2010-08-10 14:25:42 +02:00
mon_stat.c drivers: Push down BKL into various drivers 2010-05-17 05:27:41 +02:00
mon_text.c USB: Change the scatterlist type in struct urb 2010-05-20 13:21:41 -07:00
usb_mon.h USB: usbmon: end ugly tricks with DMA peeking 2009-09-23 06:46:19 -07:00