David S. Miller 8fd90bb889 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/infiniband/hw/cxgb4/device.c The cxgb4 conflict was simply overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-07-22 00:44:59 -07:00
..
common	[media] rc: abstract access to allowed/enabled protocols	2014-03-11 13:24:39 -03:00
dvb-core	net: set name_assign_type in alloc_netdev()	2014-07-15 16:12:48 -07:00
dvb-frontends	[media] tda10071: fix returned symbol rate calculation	2014-07-14 21:03:59 -03:00
firewire	firewire: introduce fw_driver.probe and .remove methods	2013-06-09 18:15:00 +02:00
i2c	Merge branches 'topic/vsp1' and 'topic/adv76xx' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media into next	2014-06-06 11:58:47 -07:00
mmc	[media] siano: get rid of CammelCase from smscoreapi.h	2013-03-21 10:03:16 -03:00
parport	[media] media: parport: Fix format string mismatch in bw-qcam.c	2014-05-23 12:18:53 -03:00
pci	[media] saa7134: use unlocked_ioctl instead of ioctl	2014-06-19 13:14:51 -03:00
platform	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2014-07-21 11:44:34 -07:00
radio	[media] si4713: fix Kconfig dependencies	2014-03-28 18:06:55 -03:00
rc	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media into next	2014-06-04 14:24:30 -07:00
tuners	[media] si2157: add one missing parenthesis	2014-06-19 13:13:05 -03:00
usb	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2014-07-21 11:44:34 -07:00
v4l2-core	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2014-07-21 11:44:34 -07: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	Linux 3.15-rc6	2014-05-21 23:03:15 -03:00
media-devnode.c	[media] media: Use a better owner for the media device	2014-05-13 13:39:00 -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