1
linux/drivers/usb/misc
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
..
sisusbvga usb: makefile cleanup 2010-10-22 10:22:07 -07:00
adutux.c
appledisplay.c
cypress_cy7c63.c
cytherm.c
emi26.c
emi62.c
ftdi-elan.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
idmouse.c
iowarrior.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-10-22 20:30:48 -07:00
isight_firmware.c
Kconfig USB: add driver for Meywa-Denki & Kayac YUREX 2010-10-22 10:21:51 -07:00
ldusb.c
legousbtower.c
Makefile usb: makefile cleanup 2010-10-22 10:22:07 -07:00
rio500_usb.h
rio500.c
trancevibrator.c
usb_u132.h
usblcd.c
usbled.c
usbsevseg.c
usbtest.c USB: usbtest - ensure correct isoc data length 2010-10-22 10:22:01 -07:00
uss720.c
yurex.c USB: yurex: fix memory leak and corrupted messages 2010-10-22 10:21:52 -07:00