github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
07a6776286
linux/drivers/media
History
黄涛 d7fb2169b6 Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0 
Conflicts:
	arch/arm/mach-rk30/include/mach/rk30_camera.h
	arch/arm/plat-rk/include/plat/rk_camera.h
	drivers/gpio/gpio-tps65910.c
	drivers/media/video/rk30_camera_oneframe.c
	drivers/mmc/host/rk29_sdmmc.c
	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c
	drivers/regulator/rk30-pwm-regulator.c
	drivers/usb/dwc_otg/dwc_otg_driver.c
	drivers/usb/dwc_otg/dwc_otg_hcd.c
	drivers/usb/dwc_otg/dwc_otg_pcd.c
	sound/soc/codecs/Makefile
	sound/soc/rk29/Kconfig
2012-08-17 21:48:20 +08:00
..
common revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36 2011-10-28 16:02:47 +08:00
dvb vp7045: fix buffer setup 2011-10-03 11:40:16 -07:00
radio Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop" 2011-07-30 16:09:59 +08:00
rc nuvoton-cir: simplify raw IR sample handling 2011-10-03 11:40:15 -07:00
video Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0 2012-08-17 21:48:20 +08:00
Kconfig [media] v4l: Create v4l2 subdev file handle structure 2011-03-22 04:53:26 -03:00
Makefile [media] media: Entities, pads and links 2011-03-22 04:53:10 -03:00
media-device.c [media] media: Links setup 2011-03-22 04:53:16 -03:00
media-devnode.c [media] media: Fix media device minor registration 2011-06-01 13:24:23 -03:00
media-entity.c [media] media: Properly handle link flags in link setup, link notify callback 2011-04-17 07:43:32 -03:00