linux-stable/include/media
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
..
davinci media: comment typo fix diable -> disable. 2011-01-03 16:03:38 +01:00
adv7343.h
ak881x.h
bt819.h [media] bt819: the ioctls in the header are internal to the kernel 2010-12-29 08:17:19 -02:00
cs53l32a.h
cs5345.h
cx2341x.h [media] v4l2-ctrls: use const char * const * for the menu arrays 2010-12-30 08:02:14 -02:00
cx25840.h
i2c-addr.h
ir-kbd-i2c.h [media] rc: Rename remote controller type to rc_type instead of ir_type 2010-12-29 08:16:50 -02:00
lirc.h
lirc_dev.h [media] lirc_dev: add some __user annotations 2010-12-29 08:16:55 -02:00
m52790.h
msp3400.h
mt9t112.h
omap1_camera.h
ov772x.h
pwc-ioctl.h
radio-si4713.h
rc-core.h [media] rc-core: fix some leftovers from the renaming patches 2010-12-29 08:16:54 -02:00
rc-map.h [media] saa7134: Add support for Compro VideoMate Vista M1F 2010-12-29 08:17:17 -02:00
rj54n1cb0c.h
s3c_fimc.h
saa6588.h [media] saa6588: rename rds.h to saa6588.h 2010-12-29 08:17:18 -02:00
saa6752hs.h
saa7115.h
saa7127.h
saa7146.h
saa7146_vv.h
sh_mobile_ceu.h
sh_mobile_csi2.h
sh_vou.h
si4713.h
soc_camera.h [media] soc_camera: Add the ability to bind regulators to soc_camedra devices 2010-12-30 22:29:37 -02:00
soc_camera_platform.h
soc_mediabus.h
sr030pc30.h
timb_radio.h [media] media: Add timberdale video-in driver 2010-12-29 08:16:46 -02:00
timb_video.h [media] media: Add timberdale video-in driver 2010-12-29 08:16:46 -02:00
tuner-types.h
tuner.h
tvaudio.h
tveeprom.h
tvp514x.h
tvp5150.h
tvp7002.h
tw9910.h
upd64031a.h
upd64083.h
v4l2-chip-ident.h [media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 sensor 2010-12-30 22:29:34 -02:00
v4l2-common.h [media] v4l2-ctrls: use const char * const * for the menu arrays 2010-12-30 08:02:14 -02:00
v4l2-ctrls.h [media] v4l2-ctrls: use const char * const * for the menu arrays 2010-12-30 08:02:14 -02:00
v4l2-dev.h
v4l2-device.h
v4l2-event.h
v4l2-fh.h
v4l2-int-device.h
v4l2-ioctl.h [media] V4L: remove V4L1 compatibility mode 2010-12-29 08:17:07 -02:00
v4l2-mediabus.h
v4l2-mem2mem.h
v4l2-subdev.h
videobuf-core.h [media] V4L: remove V4L1 compatibility mode 2010-12-29 08:17:07 -02:00
videobuf-dma-contig.h
videobuf-dma-sg.h
videobuf-dvb.h
videobuf-vmalloc.h
wm8775.h [media] wm8775: Revert changeset fcb9757333 to avoid a regression 2011-01-03 09:09:56 -02:00