David S. Miller d978a6361a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/nfc/microread/mei.c
	net/netfilter/nfnetlink_queue_core.c

Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which
some cleanups are going to go on-top.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-04-07 18:37:01 -04:00

..

common

[media] tveeprom: Fix lots of bad whitespace

2013-02-08 16:19:22 -02:00

dvb-core

net: add ETH_P_802_3_MIN

2013-03-28 01:20:42 -04:00

dvb-frontends

[media] stv0900: remove unnecessary null pointer check

2013-02-08 18:05:48 -02:00

firewire

[media] remove include/linux/dvb/dmx.h

2012-10-19 07:29:17 -03:00

i2c

[media] m5mols: Fix bug in stream on handler

2013-03-21 18:25:09 -03:00

mmc

Drivers: media: remove __dev* attributes.

2013-01-03 15:57:02 -08:00

parport

[media] bw-qcam: remove unnecessary qc_reset and qc_setscanmode calls

2013-02-05 18:20:38 -02:00

pci

[media] [REGRESSION] bt8xx: Fix too large height in cropcap

2013-03-26 08:37:00 -03:00

platform

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2013-04-03 10:48:22 -07:00

radio

media: radio-ma901: return ENODEV in probe if usb_device doesn't match

2013-03-29 15:13:40 +01:00

rc

[media] ir: IR_RX51 only works on OMAP2

2013-03-18 21:02:04 -03:00

tuners

Revert "[media] fc0011: Return early, if the frequency is already tuned"

2013-02-11 19:38:59 -02:00

usb

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2013-02-24 17:35:10 -08:00

v4l2-core

[media] fix compilation with both V4L2 and I2C as 'm'

2013-03-25 15:09:38 -03:00

Kconfig

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2013-02-24 17:35:10 -08:00

Makefile

[media] move i2c files into drivers/media/i2c

2012-09-06 18:42:54 -03:00

media-device.c

[media] media: fix MEDIA_IOC_DEVICE_INFO return code

2012-08-12 07:57:57 -03:00

media-devnode.c

[media] media-devnode: Replace printk with pr_*

2012-09-27 14:19:23 -03:00

media-entity.c

[media] media: Add link_validate() op to check links to the sink pad

2012-05-14 08:44:11 -03:00