summaryrefslogtreecommitdiffstats
path: root/net/netlabel/netlabel_unlabeled.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-01 17:25:23 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-01 17:25:23 -0800
commit100b425480d3a4c7dff4f99bead457d91ad19caf (patch)
tree309bc7612dcbc4c3ddb1385421b84dc8065e5b77 /net/netlabel/netlabel_unlabeled.c
parentd701d8a3bc1c0f56fa2759f631f86a320b66f13e (diff)
parentf3502b8a1995aceb2242389aa6dbea1a6756f78b (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (5305): Mark VIDIOC_DBG_S/G_REGISTER as experimental V4L/DVB (5271): Add VIDIOC_TRY_ENCODER_CMD and VIDIOC_ENCODER_CMD ioctls. V4L/DVB (5270): Add VIDIOC_G_ENC_INDEX ioctl V4L/DVB (5276): Cxusb: fix firmware patch for big endian systems V4L/DVB (5258): Cafe_ccic: fix compiler warning V4L/DVB (5295): Digitv: open nxt6000 i2c_gate for TDED4 tuner handling V4L/DVB (5304): Improve chip matching in v4l2_register V4L/DVB (5255): Fix cx25840 firmware loading.
Diffstat (limited to 'net/netlabel/netlabel_unlabeled.c')
0 files changed, 0 insertions, 0 deletions