kernel-ark/drivers/media/video
Linus Torvalds e9b62693ae Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial: (24 commits)
  DOC:  A couple corrections and clarifications in USB doc.
  Generate a slightly more informative error msg for bad HZ
  fix typo "is" -> "if" in Makefile
  ext*: spelling fix prefered -> preferred
  DOCUMENTATION:  Use newer DEFINE_SPINLOCK macro in docs.
  KEYS:  Fix the comment to match the file name in rxrpc-type.h.
  RAID: remove trailing space from printk line
  DMA engine: typo fixes
  Remove unused MAX_NODES_SHIFT
  MAINTAINERS: Clarify access to OCFS2 development mailing list.
  V4L: Storage class should be before const qualifier (sn9c102)
  V4L: Storage class should be before const qualifier
  sonypi: Storage class should be before const qualifier
  intel_menlow: Storage class should be before const qualifier
  DVB: Storage class should be before const qualifier
  arm: Storage class should be before const qualifier
  ALSA: Storage class should be before const qualifier
  acpi: Storage class should be before const qualifier
  firmware_sample_driver.c: fix coding style
  MAINTAINERS: Add ati_remote2 driver
  ...

Fixed up trivial conflicts in firmware_sample_driver.c
2008-04-21 16:36:46 -07:00
..
bt8xx
cpia2
cx88
cx23885
cx25840
em28xx
et61x251
ivtv
ovcamchip
pvrusb2
pwc
saa7134
sn9c102 V4L: Storage class should be before const qualifier (sn9c102) 2008-04-21 22:32:16 +00:00
usbvideo
usbvision
zc0301
adv7170.c
adv7175.c
arv.c
bt819.c
bt856.c
bt866.c
btcx-risc.c
btcx-risc.h
bw-qcam.c
bw-qcam.h
c-qcam.c
cafe_ccic-regs.h
cafe_ccic.c
compat_ioctl32.c
cpia_pp.c
cpia_usb.c
cpia.c
cpia.h
cs53l32a.c
cs5345.c
cs8420.h
cx2341x.c
dabfirmware.h
dabusb.c
dabusb.h
dpc7146.c
font.h
hexium_gemini.c
hexium_orion.c
ibmmpeg2.h
indycam.c
indycam.h
ir-kbd-i2c.c
Kconfig
ks0127.c
ks0127.h
m52790.c
Makefile
meye.c
meye.h
msp3400-driver.c
msp3400-driver.h
msp3400-kthreads.c
mt20xx.c
mt20xx.h
mxb.c
mxb.h
ov511.c
ov511.h
ov7670.c
planb.c
planb.h
pms.c
saa711x_regs.h
saa711x.c
saa5246a.c
saa5246a.h
saa5249.c
saa6588.c
saa7110.c
saa7111.c
saa7114.c
saa7115.c
saa7121.h
saa7127.c
saa7146.h
saa7146reg.h
saa7185.c
saa7191.c
saa7191.h
saa7196.h
se401.c
se401.h
stk-sensor.c
stk-webcam.c
stk-webcam.h
stradis.c
stv680.c
stv680.h
tcm825x.c
tcm825x.h
tda7432.c
tda8290.c
tda8290.h
tda9840.c
tda9840.h
tda9875.c
tda9887.c
tda9887.h
tea5761.c
tea5761.h
tea5767.c
tea5767.h
tea6415c.c
tea6415c.h
tea6420.c
tea6420.h
tlv320aic23b.c
tuner-3036.c
tuner-core.c
tuner-i2c.h
tuner-simple.c
tuner-simple.h
tuner-types.c
tuner-xc2028-types.h
tuner-xc2028.c
tuner-xc2028.h
tvaudio.c
tveeprom.c
tvp5150_reg.h
tvp5150.c
upd64031a.c
upd64083.c
v4l1-compat.c V4L: Storage class should be before const qualifier 2008-04-21 22:30:21 +00:00
v4l2-common.c
v4l2-int-device.c
videobuf-core.c
videobuf-dma-sg.c
videobuf-dvb.c
videobuf-vmalloc.c
videocodec.c
videocodec.h
videodev.c
vino.c
vino.h
vivi.c
vp27smpx.c
vpx3220.c
w9966.c
w9968cf_decoder.h
w9968cf_vpp.h
w9968cf.c
w9968cf.h
wm8739.c
wm8775.c
zoran_card.c
zoran_card.h
zoran_device.c
zoran_device.h
zoran_driver.c
zoran_procfs.c
zoran_procfs.h
zoran.h
zr364xx.c
zr36016.c
zr36016.h
zr36050.c
zr36050.h
zr36057.h
zr36060.c
zr36060.h