summaryrefslogtreecommitdiffstats
path: root/drivers/media
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39...Linus Torvalds2013-02-211-1/+1
|\
| * drivers/media: add missing GENERIC_HARDIRQS dependencyHeiko Carstens2013-02-141-1/+1
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2013-02-211-1/+1
|\ \
| * \ Merge branch 'master' into for-nextJiri Kosina2013-01-29345-2258/+7735
| |\ \
| * | | treewide: Replace incomming with incoming in all comments and stringsJorrit Schippers2013-01-031-1/+1
* | | | Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2013-02-212-2/+1
|\ \ \ \
| | \ \ \
| | \ \ \
| *-. \ \ \ Merge branch 'omap/multiplatform-fixes', tag 'v3.8-rc5' into next/multiplatformArnd Bergmann2013-02-1512-69/+58
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | [media] davinci: do not include mach/hardware.hArnd Bergmann2013-02-151-1/+0
| | |/ / / | |/| | |
| * | | | ARM: OMAP2+: Disable code that currently does not work with multiplaformTony Lindgren2013-01-111-1/+1
* | | | | Merge tag 'tty-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds2013-02-211-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge 3.8-rc5 into tty-nextGreg Kroah-Hartman2013-01-2511-68/+58
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | tty: Added a CONFIG_TTY option to allow removal of TTYJoe Millenbach2013-01-181-1/+1
| | |/ / / | |/| | |
* | | | | Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/...Linus Torvalds2013-02-2117-66/+47
|\ \ \ \ \
| * \ \ \ \ Merge 3.8-rc5 into driver-core-nextGreg Kroah-Hartman2013-01-2511-68/+58
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | media: Convert to devm_ioremap_resource()Thierry Reding2013-01-2510-49/+33
| * | | | | drivers/media: remove depends on CONFIG_EXPERIMENTALKees Cook2013-01-212-5/+5
| * | | | | drivers/media/video/s5p-tv: remove depends on CONFIG_EXPERIMENTALKees Cook2013-01-111-2/+1
| * | | | | drivers/media/video/s5p-fimc: remove depends on CONFIG_EXPERIMENTALKees Cook2013-01-111-1/+0
| * | | | | drivers/media/video/pvrusb2: remove depends on CONFIG_EXPERIMENTALKees Cook2013-01-111-4/+4
| * | | | | drivers/media/video/cx25821: remove depends on CONFIG_EXPERIMENTALKees Cook2013-01-111-1/+1
| * | | | | drivers/media: remove depends on CONFIG_EXPERIMENTALKees Cook2013-01-111-4/+3
| | |/ / / | |/| | |
* | | | | Revert "[media] dvb_frontend: return -ENOTTY for unimplement IOCTL"Mauro Carvalho Chehab2013-02-151-3/+3
| |_|_|/ |/| | |
* | | | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2013-02-064-0/+13
|\ \ \ \ | |_|/ / |/| | |
| * | | [media] radio: set vfl_dir correctly to fix modulator regressionHans Verkuil2013-01-244-0/+13
* | | | 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
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | treewide: Fix typos in various driversMasanari Iida2012-12-032-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
| |\ \ \ \ \ \ \
OpenPOWER on IntegriCloud