korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-29 14:05:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
229aebb873
linux/drivers/media/video/cx18
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
..
cx18-alsa-main.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-alsa-mixer.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-alsa-mixer.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-alsa-pcm.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-alsa-pcm.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-alsa.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-audio.c V4L/DVB (11624): cx18: Toggle the AI1 mux when changing the CX18_AUDIO_ENABLE register 2009-06-16 18:20:45 -03:00
cx18-audio.h V4L/DVB (10758): cx18: Convert I2C devices to v4l2_subdevices 2009-03-30 12:43:01 -03:00
cx18-av-audio.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-av-core.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-av-core.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-av-firmware.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-av-vbi.c V4L/DVB: cx18: support new vbi ops to set/get VBI format 2010-05-19 12:58:48 -03:00
cx18-cards.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
cx18-cards.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-controls.c V4L/DVB: cx18: remove old g/s_fmt from the cx18_av subdev 2010-06-01 01:21:20 -03:00
cx18-controls.h V4L/DVB (8113): ivtv/cx18: remove s/g_ctrl, now all controls are handled through s/g_ext_ctrl 2008-07-20 07:12:23 -03:00
cx18-driver.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-driver.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-dvb.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-dvb.h V4L/DVB (9720): cx18: Major rewrite of interrupt handling for incoming mailbox processing 2008-12-30 09:38:07 -02:00
cx18-fileops.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-fileops.h V4L/DVB: cx18: export a couple of symbols so they can be shared with cx18-alsa 2010-02-26 15:10:42 -03:00
cx18-firmware.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-firmware.h
cx18-gpio.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-gpio.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-i2c.c i2c: Add support for custom probe function 2010-08-11 18:20:56 +02:00
cx18-i2c.h V4L/DVB (10758): cx18: Convert I2C devices to v4l2_subdevices 2009-03-30 12:43:01 -03:00
cx18-io.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-io.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-ioctl.c V4L/DVB: drivers/media: Remove unnecessary casts of private_data 2010-08-02 16:42:53 -03:00
cx18-ioctl.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-irq.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-irq.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-mailbox.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-mailbox.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-queue.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-queue.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-scb.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-scb.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-streams.c V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-streams.h V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address 2010-06-01 01:24:29 -03:00
cx18-vbi.c V4L/DVB: v4l: move vbi-specific video ops to a new vbi ops struct 2010-05-19 12:58:45 -03:00
cx18-vbi.h V4L/DVB (13429): cx18: Add Memory Descriptor List (MDL) layer to buffer handling 2009-12-05 18:41:51 -02:00
cx18-version.h V4L/DVB: cx18: Increment driver version for the addition of cx18-alsa and fixes 2010-02-26 15:10:50 -03:00
cx18-video.c V4L/DVB (11380): v4l2-subdev: change s_routing prototype 2009-04-06 21:44:27 -03:00
cx18-video.h
cx23418.h V4L/DVB (13910): cx18: Fix set indextable command to properly select I/P/B index entries 2010-02-26 15:10:30 -03:00
Kconfig V4L/DVB: fix Kconfig to depends on VIDEO_IR 2010-08-12 15:07:57 -03:00
Makefile V4L/DVB: cx18: add cx18-alsa module to Makefile 2010-02-26 15:10:43 -03:00