summaryrefslogtreecommitdiffstats
path: root/drivers/media
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into for-nextJiri Kosina2013-01-29345-2258/+7735
|\
| * Merge tag 'fixes-for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2013-01-241-1/+1
| |\
| | * Merge tag 'imx-fixes-rc' of git://git.pengutronix.de/git/imx/linux-2.6 into f...Olof Johansson2013-01-221-1/+1
| | |\
| | | * [media] coda: Fix build due to iram.h renameSascha Hauer2013-01-081-1/+1
| * | | [media] uvcvideo: Set error_idx properly for S_EXT_CTRLS failuresLaurent Pinchart2013-01-111-1/+2
| * | | [media] uvcvideo: Cleanup leftovers of partial revertLaurent Pinchart2013-01-111-5/+2
| * | | [media] uvcvideo: Return -EACCES when trying to set a read-only controlLaurent Pinchart2013-01-111-1/+3
| * | | Merge tag 'v3.8-rc3' into v4l_for_linusMauro Carvalho Chehab2013-01-11118-454/+538
| |\ \ \ | | |/ /
| | * | Drivers: media: remove __dev* attributes.Greg Kroah-Hartman2013-01-03102-373/+360
| | |/
| | * Merge tag 'omap-late-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2012-12-301-2/+0
| | |\
| | | * ARM: OMAP2+: Drop plat/cpu.h for omap2plusTony Lindgren2012-12-171-2/+0
| | * | Partly revert "[media] uvcvideo: Set error_idx properly for extended controls...Rafael J. Wysocki2012-12-232-18/+13
| | |/
| | * Merge tag 'fbdev-for-3.8' of git://gitorious.org/linux-omap-dss2/linuxLinus Torvalds2012-12-153-16/+46
| | |\
| | | * OMAPDSS: use omapdss_compat_init() in other driversTomi Valkeinen2012-12-071-3/+14
| | | * [media] omap_vout: remove extra includeTomi Valkeinen2012-11-291-1/+0
| | | * [media] omap_vout: use omapdss's version instead of cpu_is_*Tomi Valkeinen2012-11-293-12/+32
| | | * Merge tag 'v3.7-rc4'Tomi Valkeinen2012-11-161-8/+10
| | | |\
| | * | \ Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-12-13271-1576/+6801
| | |\ \ \
| | * \ \ \ Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-12-132-2/+2
| | |\ \ \ \
| | * \ \ \ \ Merge tag 'pm-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm...Linus Torvalds2012-12-134-4/+4
| | |\ \ \ \ \
| | | * \ \ \ \ Merge tag 'tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed' of git:/...Olof Johansson2012-11-304-4/+4
| | | |\ \ \ \ \
| | | | * | | | | ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.hTony Lindgren2012-11-304-4/+4
| | * | | | | | | Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-12-121-10/+29
| | |\ \ \ \ \ \ \
| | | * | | | | | | mx2_camera: Fix regression caused by clock conversionFabio Estevam2012-11-161-10/+29
| | | * | | | | | | Merge remote-tracking branch 'arm-soc/imx/multiplatform' into xSascha Hauer2012-11-162-25/+72
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-12-122-25/+72
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge tag 'omap-for-v3.8/cleanup-headers-iommu-signed' of git://git.kernel.or...Olof Johansson2012-11-305-3/+6
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge branch 'omap/headers4' into next/cleanupArnd Bergmann2012-11-158-9/+12
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / | | | | |/| | | | | |
| | | * | | | | | | | Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanupOlof Johansson2012-11-061-8/+10
| | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | / / / / | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | media: mx2_camera: remove cpu_is_xxx by using platform_device_idShawn Guo2012-10-151-24/+71
| | | * | | | | | | dma: ipu: rename mach/ipu.h to include/linux/dma/ipu-dma.hShawn Guo2012-10-151-1/+1
| | * | | | | | | | Merge tag 'headers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-12-1212-11/+17
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge tag 'omap-for-v3.8/cleanup-headers-iommu-signed' of git://git.kernel.or...Olof Johansson2012-11-305-3/+6
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | / / / / | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | ARM: OMAP2+: Move iommu/iovmm headers to platform_dataTony Lindgren2012-11-201-1/+0
| | | | * | | | | | ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.hTony Lindgren2012-11-205-4/+5
| | | | |/ / / / /
| | | * | | | | | ARM: OMAP: Move omap-pm-noop.c local to mach-omap2Tony Lindgren2012-10-311-1/+0
| | | * | | | | | Merge tag 'omap-for-v3.8/cleanup-headers-signed' into omap-for-v3.8/cleanup-h...Tony Lindgren2012-10-247-8/+12
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | | * | | | | ARM: OMAP: Make plat/omap-pm.h local to mach-omap2Tony Lindgren2012-10-181-1/+0
| | | | * | | | | Merge branch 'omap-for-v3.8/cleanup-headers-dss' into omap-for-v3.8/cleanup-h...Tony Lindgren2012-10-173-3/+3
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | |
| | | | | * | | | OMAP: move arch/arm/plat-omap/include/plat/vrfb.hTomi Valkeinen2012-10-173-3/+3
| | | | | |/ / /
| | | | * | | | ARM: OMAP: DMA: Move plat/dma.h to plat-omap/dma-omap.hLokesh Vutla2012-10-154-4/+4
| | | | * | | | ARM: OMAP2+: DMA: Moving OMAP2+ DMA channel definitions to mach-omap2Lokesh Vutla2012-10-151-0/+2
| | | | * | | | ARM: OMAP1: DMA: Moving OMAP1 DMA channel definitions to mach-omap1Lokesh Vutla2012-10-152-0/+3
| | | | |/ / /
| * | | | | | [media] omap3isp: Don't include <plat/cpu.h>Laurent Pinchart2013-01-061-2/+0
| * | | | | | [media] s5p-mfc: Fix interrupt error handling routineKamil Debski2013-01-061-51/+37
| * | | | | | [media] s5p-fimc: Fix return value of __fimc_md_create_flite_source_links()Sylwester Nawrocki2013-01-061-1/+1
| * | | | | | [media] m5mols: Fix typo in get_fmt callbackSylwester Nawrocki2013-01-061-1/+1
| * | | | | | [media] v4l: vb2: Set data_offset to 0 for single-plane output buffersLaurent Pinchart2013-01-061-1/+3
| * | | | | | [media] [FOR,v3.8] omap3isp: Don't include deleted OMAP plat/ header filesLaurent Pinchart2013-01-011-3/+0
| * | | | | | [media] gspca_sonixj: Add a small delay after i2c_w1Hans de Goede2012-12-211-0/+1
OpenPOWER on IntegriCloud