76d21c5635
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits) [media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly [media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE [media] v4l: soc-camera: Store negotiated buffer settings [media] rc: interim support for 32-bit NEC-ish scancodes [media] mceusb: topseed 0x0011 needs gen3 init for tx to work [media] lirc_zilog: error out if buffer read bytes != chunk size [media] lirc: silence some compile warnings [media] hdpvr: use same polling interval as other OS [media] ir-kbd-i2c: pass device code w/key in hauppauge case [media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap [media] remove the old RC_MAP_HAUPPAUGE_NEW RC map [media] rc/keymaps: Rename Hauppauge table as rc-hauppauge [media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping [media] rc-rc5-hauppauge-new: Add support for the old Black RC [media] rc-rc5-hauppauge-new: Add the old control to the table [media] rc-winfast: Fix the keycode tables [media] a800: Fix a few wrong IR key assignments [media] opera1: Use multimedia keys instead of an app-specific mapping [media] dw2102: Use multimedia keys instead of an app-specific mapping ... Fix up trivial conflicts (remove/modify and some real conflicts) in: arch/arm/mach-omap2/devices.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/dabusb/dabusb.c drivers/staging/dabusb/dabusb.h drivers/staging/easycap/easycap_ioctl.c drivers/staging/usbvideo/usbvideo.c drivers/staging/usbvideo/vicam.c |
||
|---|---|---|
| .. | ||
| aty | ||
| backlight | ||
| console | ||
| display | ||
| geode | ||
| i810 | ||
| intelfb | ||
| kyro | ||
| logo | ||
| matrox | ||
| mb862xx | ||
| mbx | ||
| msm | ||
| nvidia | ||
| omap | ||
| omap2 | ||
| pnx4008 | ||
| riva | ||
| savage | ||
| sis | ||
| vermilion | ||
| via | ||
| 68328fb.c | ||
| Kconfig | ||
| Makefile | ||
| acornfb.c | ||
| acornfb.h | ||
| amba-clcd.c | ||
| amifb.c | ||
| arcfb.c | ||
| arkfb.c | ||
| asiliantfb.c | ||
| atafb.c | ||
| atafb.h | ||
| atafb_iplan2p2.c | ||
| atafb_iplan2p4.c | ||
| atafb_iplan2p8.c | ||
| atafb_mfb.c | ||
| atafb_utils.h | ||
| atmel_lcdfb.c | ||
| au1100fb.c | ||
| au1100fb.h | ||
| au1200fb.c | ||
| au1200fb.h | ||
| bf54x-lq043fb.c | ||
| bf537-lq035.c | ||
| bfin-lq035q1-fb.c | ||
| bfin-t350mcqb-fb.c | ||
| bfin_adv7393fb.c | ||
| bfin_adv7393fb.h | ||
| broadsheetfb.c | ||
| bt431.h | ||
| bt455.h | ||
| bw2.c | ||
| c2p.h | ||
| c2p_core.h | ||
| c2p_iplan2.c | ||
| c2p_planar.c | ||
| carminefb.c | ||
| carminefb.h | ||
| carminefb_regs.h | ||
| cfbcopyarea.c | ||
| cfbfillrect.c | ||
| cfbimgblt.c | ||
| cg3.c | ||
| cg6.c | ||
| cg14.c | ||
| chipsfb.c | ||
| cirrusfb.c | ||
| clps711xfb.c | ||
| cobalt_lcdfb.c | ||
| controlfb.c | ||
| controlfb.h | ||
| cyber2000fb.c | ||
| cyber2000fb.h | ||
| da8xx-fb.c | ||
| dnfb.c | ||
| edid.h | ||
| efifb.c | ||
| ep93xx-fb.c | ||
| epson1355fb.c | ||
| fb-puv3.c | ||
| fb_ddc.c | ||
| fb_defio.c | ||
| fb_draw.h | ||
| fb_notify.c | ||
| fb_sys_fops.c | ||
| fbcmap.c | ||
| fbcvt.c | ||
| fbmem.c | ||
| fbmon.c | ||
| fbsysfs.c | ||
| ffb.c | ||
| fm2fb.c | ||
| fsl-diu-fb.c | ||
| g364fb.c | ||
| gbefb.c | ||
| gxt4500.c | ||
| hecubafb.c | ||
| hgafb.c | ||
| hitfb.c | ||
| hpfb.c | ||
| igafb.c | ||
| imsttfb.c | ||
| imxfb.c | ||
| jz4740_fb.c | ||
| leo.c | ||
| macfb.c | ||
| macmodes.c | ||
| macmodes.h | ||
| maxinefb.c | ||
| metronomefb.c | ||
| modedb.c | ||
| mx3fb.c | ||
| mxsfb.c | ||
| n411.c | ||
| neofb.c | ||
| nuc900fb.c | ||
| nuc900fb.h | ||
| offb.c | ||
| output.c | ||
| p9100.c | ||
| platinumfb.c | ||
| platinumfb.h | ||
| pm2fb.c | ||
| pm3fb.c | ||
| pmag-aa-fb.c | ||
| pmag-ba-fb.c | ||
| pmagb-b-fb.c | ||
| ps3fb.c | ||
| pvr2fb.c | ||
| pxa3xx-gcu.c | ||
| pxa3xx-gcu.h | ||
| pxa168fb.c | ||
| pxa168fb.h | ||
| pxafb.c | ||
| pxafb.h | ||
| q40fb.c | ||
| s1d13xxxfb.c | ||
| s3c-fb.c | ||
| s3c2410fb.c | ||
| s3c2410fb.h | ||
| s3fb.c | ||
| sa1100fb.c | ||
| sa1100fb.h | ||
| sbuslib.c | ||
| sbuslib.h | ||
| sgivwfb.c | ||
| sh7760fb.c | ||
| sh_mipi_dsi.c | ||
| sh_mobile_hdmi.c | ||
| sh_mobile_lcdcfb.c | ||
| sh_mobile_lcdcfb.h | ||
| skeletonfb.c | ||
| sm501fb.c | ||
| sstfb.c | ||
| sticore.h | ||
| stifb.c | ||
| sunxvr500.c | ||
| sunxvr1000.c | ||
| sunxvr2500.c | ||
| svgalib.c | ||
| syscopyarea.c | ||
| sysfillrect.c | ||
| sysimgblt.c | ||
| tcx.c | ||
| tdfxfb.c | ||
| tgafb.c | ||
| tmiofb.c | ||
| tridentfb.c | ||
| udlfb.c | ||
| uvesafb.c | ||
| valkyriefb.c | ||
| valkyriefb.h | ||
| vesafb.c | ||
| vfb.c | ||
| vga16fb.c | ||
| vgastate.c | ||
| vt8500lcdfb.c | ||
| vt8500lcdfb.h | ||
| vt8623fb.c | ||
| w100fb.c | ||
| w100fb.h | ||
| wm8505fb.c | ||
| wm8505fb_regs.h | ||
| wmt_ge_rops.c | ||
| wmt_ge_rops.h | ||
| xen-fbfront.c | ||
| xilinxfb.c | ||