forked from luck/tmp_suning_uos_patched
664a41b8a9
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (430 commits)
[media] ir-mce_kbd-decoder: include module.h for its facilities
[media] ov5642: include module.h for its facilities
[media] em28xx: Fix DVB-C maxsize for em2884
[media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz
[media] v4l: mt9v032: Fix Bayer pattern
[media] V4L: mt9m111: rewrite set_pixfmt
[media] V4L: mt9m111: fix missing return value check mt9m111_reg_clear
[media] V4L: initial driver for ov5642 CMOS sensor
[media] V4L: sh_mobile_ceu_camera: fix Oops when USERPTR mapping fails
[media] V4L: soc-camera: remove soc-camera bus and devices on it
[media] V4L: soc-camera: un-export the soc-camera bus
[media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
[media] V4L: add media bus configuration subdev operations
[media] V4L: soc-camera: group struct field initialisations together
[media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
[media] V4L: pxa-camera: switch to using standard PM hooks
[media] NetUP Dual DVB-T/C CI RF: force card hardware revision by module param
[media] Don't OOPS if videobuf_dvb_get_frontend return NULL
[media] NetUP Dual DVB-T/C CI RF: load firmware according card revision
[media] omap3isp: Support configurable HS/VS polarities
...
Fix up conflicts:
- arch/arm/mach-omap2/board-rx51-peripherals.c:
cleanup regulator supply definitions in mach-omap2
vs
OMAP3: RX-51: define vdds_csib regulator supply
- drivers/staging/tm6000/tm6000-alsa.c (trivial)
|
||
|---|---|---|
| .. | ||
| amd5536udc.c | ||
| amd5536udc.h | ||
| at91_udc.c | ||
| at91_udc.h | ||
| atmel_usba_udc.c | ||
| atmel_usba_udc.h | ||
| audio.c | ||
| cdc2.c | ||
| ci13xxx_msm.c | ||
| ci13xxx_pci.c | ||
| ci13xxx_udc.c | ||
| ci13xxx_udc.h | ||
| composite.c | ||
| config.c | ||
| dbgp.c | ||
| dummy_hcd.c | ||
| epautoconf.c | ||
| ether.c | ||
| f_acm.c | ||
| f_audio.c | ||
| f_ecm.c | ||
| f_eem.c | ||
| f_fs.c | ||
| f_hid.c | ||
| f_loopback.c | ||
| f_mass_storage.c | ||
| f_ncm.c | ||
| f_obex.c | ||
| f_phonet.c | ||
| f_rndis.c | ||
| f_serial.c | ||
| f_sourcesink.c | ||
| f_subset.c | ||
| f_uvc.c | ||
| f_uvc.h | ||
| file_storage.c | ||
| fsl_mxc_udc.c | ||
| fsl_qe_udc.c | ||
| fsl_qe_udc.h | ||
| fsl_udc_core.c | ||
| fsl_usb2_udc.h | ||
| fusb300_udc.c | ||
| fusb300_udc.h | ||
| g_ffs.c | ||
| g_zero.h | ||
| gadget_chips.h | ||
| gmidi.c | ||
| goku_udc.c | ||
| goku_udc.h | ||
| hid.c | ||
| imx_udc.c | ||
| imx_udc.h | ||
| inode.c | ||
| Kconfig | ||
| langwell_udc.c | ||
| langwell_udc.h | ||
| m66592-udc.c | ||
| m66592-udc.h | ||
| Makefile | ||
| mass_storage.c | ||
| multi.c | ||
| mv_udc_core.c | ||
| mv_udc_phy.c | ||
| mv_udc.h | ||
| ncm.c | ||
| ndis.h | ||
| net2272.c | ||
| net2272.h | ||
| net2280.c | ||
| net2280.h | ||
| nokia.c | ||
| omap_udc.c | ||
| omap_udc.h | ||
| pch_udc.c | ||
| printer.c | ||
| pxa25x_udc.c | ||
| pxa25x_udc.h | ||
| pxa27x_udc.c | ||
| pxa27x_udc.h | ||
| r8a66597-udc.c | ||
| r8a66597-udc.h | ||
| rndis.c | ||
| rndis.h | ||
| s3c2410_udc.c | ||
| s3c2410_udc.h | ||
| s3c-hsotg.c | ||
| s3c-hsudc.c | ||
| serial.c | ||
| storage_common.c | ||
| u_audio.c | ||
| u_audio.h | ||
| u_ether.c | ||
| u_ether.h | ||
| u_phonet.h | ||
| u_serial.c | ||
| u_serial.h | ||
| udc-core.c | ||
| usbstring.c | ||
| uvc_queue.c | ||
| uvc_queue.h | ||
| uvc_v4l2.c | ||
| uvc_video.c | ||
| uvc.h | ||
| webcam.c | ||
| zero.c | ||