FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-26 03:17:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
a8fa94e0f2
linux/drivers/media
History
Tejun Heo a8fa94e0f2 Merge branch 'master' into driver-core-next-test-merge-rc2 
da9846ae15 ("kernfs: make kernfs_deactivate() honor KERNFS_LOCKDEP
flag") in driver-core-linus conflicts with kernfs_drain() updates in
driver-core-next.  The former just adds the missing KERNFS_LOCKDEP
checks which are already handled by kernfs_lockdep() checks in
driver-core-next.  The conflict can be resolved by taking code from
driver-core-next.

Conflicts:
	fs/kernfs/dir.c
2014-02-10 19:34:30 -05:00
..
common [media] media_tree: Fix spelling errors 2013-12-09 14:50:50 -02:00
dvb-core Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2014-01-31 09:31:14 -08:00
dvb-frontends [media] cx24117: use a valid dev pointer for dev_err printout 2014-02-04 06:36:03 -02:00
firewire firewire: introduce fw_driver.probe and .remove methods 2013-06-09 18:15:00 +02:00
i2c [media] adv7842: Composite free-run platfrom-data fix 2014-02-04 06:46:10 -02:00
mmc [media] siano: get rid of CammelCase from smscoreapi.h 2013-03-21 10:03:16 -03:00
parport [media] bw-qcam: fix timestamp handling 2013-05-27 09:30:19 -03:00
pci [media] update Michael Krufky's email address 2014-02-04 06:34:21 -02:00
platform [media] exynos4-is: Compile in fimc-lite runtime PM callbacks conditionally 2014-02-04 05:59:22 -02:00
radio [media] radio-usb-si4713: fix sparse non static symbol warnings 2014-01-15 09:12:51 -02:00
rc [media] rc-core: reuse device numbers 2014-01-15 11:46:37 -02:00
tuners [media] tuner-xc2028: Don't read status if device is powered down 2014-01-10 06:05:13 -02:00
usb [media] hdpvr: Fix memory leak in debug 2014-02-04 06:43:53 -02:00
v4l2-core Merge branch 'master' into driver-core-next-test-merge-rc2 2014-02-10 19:34:30 -05:00
Kconfig [media] subdev autoselect only works if I2C and I2C_MUX is selected 2013-12-21 06:03:06 -02:00
Makefile
media-device.c [media] media: info leak in __media_device_enum_links() 2013-06-12 18:52:45 -03:00
media-devnode.c [media] media: Add 64--32 bit compat ioctl handler 2013-03-18 20:44:36 -03:00
media-entity.c [media] media: Check for active links on pads with MEDIA_PAD_FL_MUST_CONNECT flag 2013-12-04 15:03:45 -02:00