openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/media/video/cx18
History
Linus Torvalds 008d23e485 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: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
 		2011-01-13 10:05:56 -08:00
..
Kconfig [media] rc: rename the remaining things to rc_core 2010-12-29 08:16:50 -02:00
Makefile V4L/DVB: cx18: add cx18-alsa module to Makefile 2010-02-26 15:10:43 -03: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 [media] cx18: convert to unlocked_ioctl 2010-12-01 20:10:16 -02: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 [media] v4l: fix handling of v4l2_input.capabilities 2010-12-30 08:02:29 -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 [media] v4l2-ctrls: use const char * const * for the menu arrays 2010-12-30 08:02:14 -02: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 Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2011-01-07 16:58:04 -08:00
cx18-driver.h [media] cx18: Only allocate a struct cx18_dvb for the DVB TS stream 2010-12-29 08:17:10 -02:00
cx18-dvb.c [media] cx18: Only allocate a struct cx18_dvb for the DVB TS stream 2010-12-29 08:17:10 -02: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 [media] rc: Rename remote controller type to rc_type instead of ir_type 2010-12-29 08:16:50 -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: v4l: remove unused i2c-id.h headers 2010-10-21 01:06:05 -02: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 [media] cx18: Only allocate a struct cx18_dvb for the DVB TS stream 2010-12-29 08:17:10 -02: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 [media] cx18: Only allocate a struct cx18_dvb for the DVB TS stream 2010-12-29 08:17:10 -02:00
cx18-streams.h [media] cx18: Only allocate a struct cx18_dvb for the DVB TS stream 2010-12-29 08:17:10 -02: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 media: comment typo fix diable -> disable. 2011-01-03 16:03:38 +01:00