1
linux/drivers/media/video/cx23885
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
..
cimax2.c
cimax2.h
cx23885-417.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
cx23885-av.c V4L/DVB: cx23885: Move AV Core irq handling to a work handler 2010-08-08 23:42:56 -03:00
cx23885-av.h V4L/DVB: cx23885: Move AV Core irq handling to a work handler 2010-08-08 23:42:56 -03:00
cx23885-cards.c V4L/DVB: cx23885: Require user to explicitly enable CX2388[57] IR via module param 2010-08-08 23:42:56 -03:00
cx23885-core.c V4L/DVB: cx23885: Move AV Core irq handling to a work handler 2010-08-08 23:42:56 -03:00
cx23885-dvb.c V4L/DVB: Fix kernel Oops when number of NetUP Dual DVB-S2-CI cards more than DVB_MAX_ADAPTERS limit 2010-08-02 14:52:54 -03:00
cx23885-f300.c
cx23885-f300.h
cx23885-i2c.c V4L/DVB: Use custom I2C probing function mechanism 2010-08-11 18:20:57 +02:00
cx23885-input.c V4L/DVB: cx23885, cx25840: Change IR measurment records to use struct ir_raw_event 2010-08-08 23:42:56 -03:00
cx23885-input.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx23885-ioctl.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx23885-ioctl.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx23885-ir.c V4L/DVB: cx23885: Move AV Core irq handling to a work handler 2010-08-08 23:42:56 -03:00
cx23885-ir.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx23885-reg.h V4L/DVB: cx23885: Add preliminary IR Rx support for the HVR-1250 and TeVii S470 2010-08-08 23:42:55 -03:00
cx23885-vbi.c V4L/DVB: cx23885: Protect PCI interrupt mask manipulations with a spinlock 2010-08-08 23:42:55 -03:00
cx23885-video.c V4L/DVB: cx23885: Protect PCI interrupt mask manipulations with a spinlock 2010-08-08 23:42:55 -03:00
cx23885.h V4L/DVB: cx23885: Move AV Core irq handling to a work handler 2010-08-08 23:42:56 -03:00
cx23888-ir.c V4L/DVB: cx23885, cx25840: Change IR measurment records to use struct ir_raw_event 2010-08-08 23:42:56 -03:00
cx23888-ir.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
Kconfig V4L/DVB: Fix IR_CORE dependencies 2010-08-12 15:07:48 -03:00
Makefile V4L/DVB: cx23885: Move AV Core irq handling to a work handler 2010-08-08 23:42:56 -03:00
netup-eeprom.c
netup-eeprom.h
netup-init.c
netup-init.h