q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/drivers/usb/misc
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
..
sisusbvga usb: makefile cleanup 2010-10-22 10:22:07 -07:00
adutux.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
appledisplay.c USB: rename usb_buffer_alloc() and usb_buffer_free() users 2010-05-20 13:21:38 -07:00
cypress_cy7c63.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
cytherm.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
emi26.c USB misc: make USB device id constant 2010-03-02 14:54:17 -08:00
emi62.c USB misc: make USB device id constant 2010-03-02 14:54:17 -08:00
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 llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
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 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
Kconfig USB: add driver for Meywa-Denki & Kayac YUREX 2010-10-22 10:21:51 -07:00
ldusb.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
legousbtower.c USB: misc: Remove unnecessary casts of private_data 2010-08-10 14:35:39 -07:00
Makefile usb: makefile cleanup 2010-10-22 10:22:07 -07:00
rio500.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
rio500_usb.h
trancevibrator.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
usb_u132.h
usblcd.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
usbled.c USB misc: make USB device id constant 2010-03-02 14:54:17 -08:00
usbsevseg.c USB: fixed bug in usbsevseg using USB autosuspend incorrectly 2010-04-22 15:18:21 -07:00
usbtest.c USB: usbtest - ensure correct isoc data length 2010-10-22 10:22:01 -07:00
uss720.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
yurex.c USB: yurex: fix memory leak and corrupted messages 2010-10-22 10:21:52 -07:00