)]}' { "log": [ { "commit": "01c40c048b0f3f377e6d27b35fd99f04efcc21dd", "tree": "664b3b188965b32887277f950c628bfc1433456d", "parents": [ "bda50bcd0cc21d9d6dd8c82628f763ab108260a6" ], "author": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Fri Nov 19 11:20:06 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jan 19 11:52:09 2011 -0200" }, "message": "[media] v4l: Include linux/videodev2.h in media/v4l2-ctrls.h\n\nThe later makes extensive use of structures defined in the former.\n\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "5aad724280b9f8ffff3a55311ef0ba35ebb4099a", "tree": "0f076e7baaf5d91cbcc6557d4c88208f83402145", "parents": [ "9ad77eb57b45f81ac3e12077d19e5f121c4cff6d" ], "author": { "name": "Jarod Wilson", "email": "jarod@redhat.com", "time": "Thu Jan 06 16:59:36 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jan 19 11:45:52 2011 -0200" }, "message": "[media] rc: fix up and genericize some time unit conversions\n\nThe ene_ir driver was using a private define of MS_TO_NS, which is meant\nto be microseconds to nanoseconds. The mceusb driver copied it,\nintending to use is a milliseconds to microseconds. Lets move the\ndefines to a common location, expand and standardize them a touch, so\nthat we now have:\n\n MS_TO_NS - milliseconds to nanoseconds\n MS_TO_US - milliseconds to microseconds\n US_TO_NS - microseconds to nanoseconds\n\nReported-by: David Härdeman \u003cdavid@hardeman.nu\u003e\nCC: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nSigned-off-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "2a863793beaa0fc9ee7aeb87efe85544a6b129c0", "tree": "9316b12b95a707eb5541db2e24d6033d9b0e2805", "parents": [ "45f6f84af3ae9db19f39bc5d0976d626b0ef626e" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Tue Jan 11 14:45:03 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jan 19 11:45:32 2011 -0200" }, "message": "[media] v4l2-ctrls: v4l2_ctrl_handler_setup must set is_new to 1\n\nRenamed has_new to is_new.\n\nDrivers can use the is_new field to determine if a new value was specified\nfor a control. The v4l2_ctrl_handler_setup() must always set this to 1 since\nthe setup has to force a full update of all controls.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nAcked-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "45f6f84af3ae9db19f39bc5d0976d626b0ef626e", "tree": "f3ef2f5bb782f5d7180c5cc2a8ab58fd855a4ccf", "parents": [ "3c7c9370fb645f4713e0fbbe69425d8db9b47a13" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Sat Jan 08 07:15:53 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jan 19 11:45:31 2011 -0200" }, "message": "[media] v4l2-subdev: add (un)register internal ops\n\nSome subdevs need to call into the board code after they are registered\nand have a valid struct v4l2_device pointer. The s_config op was abused\nfor this, but now that it is removed we need a cleaner way of solving this.\n\nSo this patch adds a struct with internal ops that the v4l2 core can call.\n\nCurrently only two ops exist: register and unregister. Subdevs can implement\nthese to call the board code and pass it the v4l2_device pointer, which the\nboard code can then use to get access to the struct that embeds the\nv4l2_device.\n\nIt is expected that in the future open and close ops will also be added.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nAcked-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "3c7c9370fb645f4713e0fbbe69425d8db9b47a13", "tree": "f7a0580c92bd37826f82aa87052b180addb25e4e", "parents": [ "ecb71d262b0323981e07ce415da9b7adc917990a" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Sat Jan 08 07:08:02 2011 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jan 19 11:45:30 2011 -0200" }, "message": "[media] v4l2-subdev: remove core.s_config and v4l2_i2c_new_subdev_cfg()\n\nThe core.s_config op was meant for legacy drivers that needed to work with old\npre-2.6.26 kernels. This is no longer relevant. Unfortunately, this op was\nincorrectly called from several drivers.\n\nReplace those occurences with proper i2c_board_info structs and call\nv4l2_i2c_new_subdev_board.\n\nAfter these changes v4l2_i2c_new_subdev_cfg() was no longer used, so remove\nthat function as well.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nAcked-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "9af39713feb53da96ba23fa94a73ffd0de50a815", "tree": "264b278d0e741e031f0c9ed940fd78e5502de6e8", "parents": [ "b219ab9cfb2057de6e779169197f83265c310c83" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Sat Dec 18 09:20:59 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Jan 19 11:28:10 2011 -0200" }, "message": "[media] saa7146: Convert from .ioctl to .unlocked_ioctl\n\nConvert saa7146 to use core-assisted locking.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "008d23e4852d78bb2618f2035f8b2110b6a6b968", "tree": "81c88f744f6f3fc84132527c1ddc0b4da410c5e2", "parents": [ "8f685fbda43deccd130d192c9fcef1444649eaca", "bfc672dcf323877228682aff79dff8ecd9f30ff8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n Documentation/trace/events.txt: Remove obsolete sched_signal_send.\n writeback: fix global_dirty_limits comment runtime -\u003e real-time\n ppc: fix comment typo singal -\u003e signal\n drivers: fix comment typo diable -\u003e disable.\n m68k: fix comment typo diable -\u003e disable.\n wireless: comment typo fix diable -\u003e disable.\n media: comment typo fix diable -\u003e disable.\n remove doc for obsolete dynamic-printk kernel-parameter\n remove extraneous \u0027is\u0027 from Documentation/iostats.txt\n Fix spelling milisec -\u003e ms in snd_ps3 module parameter description\n Fix spelling mistakes in comments\n Revert conflicting V4L changes\n i7core_edac: fix typos in comments\n mm/rmap.c: fix comment\n sound, ca0106: Fix assignment to \u0027channel\u0027.\n hrtimer: fix a typo in comment\n init/Kconfig: fix typo\n anon_inodes: fix wrong function name in comment\n fix comment typos concerning \"consistent\"\n poll: fix a typo in comment\n ...\n\nFix up trivial conflicts in:\n - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)\n - fs/ext4/ext4.h\n\nAlso fix missed \u0027diabled\u0027 typo in drivers/net/bnx2x/bnx2x.h while at it.\n" }, { "commit": "9e9bc9736756f25d6c47b4eba0ebf25b20a6f153", "tree": "647240f479c5f23910c3e6194d1c35b6ba54d75e", "parents": [ "3c0cb7c31c206aaedb967e44b98442bbeb17a6c4", "e3c92215198cb6aa00ad38db2780faa6b72e0a3f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 06 18:32:12 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 06 18:32:12 2011 -0800" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (255 commits)\n [media] radio-aimslab.c: Fix gcc 4.5+ bug\n [media] cx25821: Fix compilation breakage due to BKL dependency\n [media] v4l2-compat-ioctl32: fix compile warning\n [media] zoran: fix compiler warning\n [media] tda18218: fix compile warning\n [media] ngene: fix compile warning\n [media] DVB: IR support for TechnoTrend CT-3650\n [media] cx23885, cimax2.c: Fix case of two CAM insertion irq\n [media] ir-nec-decoder: fix repeat key issue\n [media] staging: se401 depends on USB\n [media] staging: usbvideo/vicam depends on USB\n [media] soc_camera: Add the ability to bind regulators to soc_camedra devices\n [media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 sensor\n [media] v4l: soc-camera: switch to .unlocked_ioctl\n [media] v4l: ov772x: simplify pointer dereference\n [media] ov9640: fix OmniVision OV9640 sensor driver\u0027s priv data retrieving\n [media] ov9640: use macro to request OmniVision OV9640 sensor private data\n [media] ivtv-i2c: Fix two warnings\n [media] staging/lirc: Update lirc TODO files\n [media] cx88: Remove the obsolete i2c_adapter.id field\n ...\n" }, { "commit": "eb78bd7d8a39415245a8d20ae3b464ddde68b20a", "tree": "18fea76187bbe53c6002efbe3f3bdb8179dd368a", "parents": [ "44dd4ff33cde33d52d4376130f770b50f64218ca" ], "author": { "name": "Justin P. Mattock", "email": "justinmattock@gmail.com", "time": "Thu Dec 30 15:08:03 2010 -0800" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jan 03 16:03:38 2011 +0100" }, "message": "media: comment typo fix diable -\u003e disable.\n\nThe below patch fixes a typo \"diable\" to \"disable\".\n\nSigned-off-by: Justin P. Mattock \u003cjustinmattock@gmail.com\u003e\nAcked-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "46e67acd5d4cacda758e871eebd15cef4e2c2665", "tree": "80fc9c755da220725b26e76c522a0c9414b11abf", "parents": [ "f23b7952d37c69c0caa6c8dfb85dbf2eb9e5fcaa" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Mon Jan 03 09:09:56 2011 -0200" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Mon Jan 03 09:09:56 2011 -0200" }, "message": "[media] wm8775: Revert changeset fcb9757333 to avoid a regression\n\nIt seems that cx88 and ivtv use wm8775 on some different modes. The\npatch that added support for a board with wm8775 broke ivtv boards with\nthis device. As we\u0027re too close to release 2.6.37, let\u0027s just revert\nit.\n\nReported-by: Andy Walls \u003cawalls@md.metrocast.net\u003e\nReported-by: Eric Sharkey \u003ceric@lisaneric.org\u003e\nReported-by: Auric \u003cauric@aanet.com.au\u003e\nReported by: David Gesswein \u003cdjg@pdp8online.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "96e442c1b2ef2ba9476e5da2607ba666ce09664d", "tree": "d0bcf51f63ff89b1740ebd6764492ac5db7e7be6", "parents": [ "3153ac9c6208892ee237caccdbe2290f8247e236" ], "author": { "name": "Alberto Panizzo", "email": "maramaopercheseimorto@gmail.com", "time": "Thu Dec 02 07:43:37 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Dec 30 22:29:37 2010 -0200" }, "message": "[media] soc_camera: Add the ability to bind regulators to soc_camedra devices\n\nIn certain machines, camera devices are supplied directly\nby a number of regulators. This patch add the ability to drive\nthese regulators directly by the soc_camera driver.\n\nSigned-off-by: Alberto Panizzo \u003cmaramaopercheseimorto@gmail.com\u003e\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "3153ac9c6208892ee237caccdbe2290f8247e236", "tree": "faf6d8ec4a1f2f7d4bdd577ee0b5bbaeef550388", "parents": [ "b6a633c18ba83c0c8e96759a31d356bfb77e2b5f" ], "author": { "name": "Alberto Panizzo", "email": "maramaopercheseimorto@gmail.com", "time": "Thu Dec 02 11:53:28 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Dec 30 22:29:34 2010 -0200" }, "message": "[media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 sensor\n\nSigned-off-by: Alberto Panizzo \u003cmaramaopercheseimorto@gmail.com\u003e\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "513521eaee4375a1a0da0b73c7131a165a9fe4d9", "tree": "352f8d9053c1dd6d6866f13feed818bb24934f4a", "parents": [ "6d6a48e51fd3bcb40c5b88d0f9690ba960eedfd2" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Wed Dec 29 14:25:52 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Dec 30 08:02:14 2010 -0200" }, "message": "[media] v4l2-ctrls: use const char * const * for the menu arrays\n\nThis prevents checkpatch warnings generated when defining\n\u0027static const char *foo[]\u0027 arrays. It makes sense to use\nconst char * const * anyway since the pointers in the array\nare indeed const.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "66832aef0694807f487a8ccc8871cea4e80d78c5", "tree": "0f725c8421c73925e1c59faf26253dc17a585c5e", "parents": [ "b9218f2f15cdff8991ba041993bf40962c49fdd0" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Mon Dec 27 12:27:50 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:17:19 2010 -0200" }, "message": "[media] bt819: the ioctls in the header are internal to the kernel\n\nRemove bt819.h from ioctl-number.txt and make a note in the header\nthat these ioctls are for internal use only.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "b9218f2f15cdff8991ba041993bf40962c49fdd0", "tree": "98e7d9e2a5e92a9a51e8b3408e750b0c508f929d", "parents": [ "a519d70e0cf346e946202ffcbeaf57a1748d0c03" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Mon Dec 27 12:22:46 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:17:18 2010 -0200" }, "message": "[media] saa6588: rename rds.h to saa6588.h\n\nThe naming of the media/rds.h header suggested that it was a generic\nRDS header, when in fact it is just a saa6588 module API that is\ninternal to the kernel.\n\nRename the header and the struct and defines in it to make this clear.\n\nAlso removed the header include in radio-si470x.h (not used anymore)\nand from ioctl-number.txt (it\u0027s internal to the kernel and never called\nfrom userspace).\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "b7a0f2e793a52b306e682a0e2e9a0b6f0f0a730e", "tree": "137d0e3af908043048e1c08274762236ce637137", "parents": [ "44c6e2a7c2ec76dd495a0f330f9beac572a2fdd7" ], "author": { "name": "Ramiro Morales", "email": "ramiro@rmorales.net", "time": "Sun Dec 26 18:13:30 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:17:17 2010 -0200" }, "message": "[media] saa7134: Add support for Compro VideoMate Vista M1F\n\nSigned-off-by: Pavel Osnova \u003cpvosnova@gmail.com\u003e\nSigned-off-by: Ramiro Morales \u003cramiro@rmorales.net\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "88ae7624a6fe890e5a8ca57b25420f66e1389f8b", "tree": "cfdb6188e0234cf3d819984790f909f5c6e1e102", "parents": [ "58c66df3e38ffb1d59cc5162bb9e07c859288034" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Mon Dec 27 07:47:54 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:17:11 2010 -0200" }, "message": "[media] V4L1 removal: Remove linux/videodev.h\n\nThere\u0027s no sense on keeping it on 2.6.38, as nobody is using it\nanymore, at the kernel tree, and installing it at the userspace\nAPI.\n\nAs two deprecated drivers still need it, move it to their internal\ndirectories.\n\nReviewed-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "08af245de0cf6ab5f4ed008ee2bb99273774fce0", "tree": "d07a9b38eb4b9442ef0e935063a5f7f40248e19e", "parents": [ "b69a219e0e97441dbeb0262cf85468b61a161399" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Fri Dec 24 10:33:19 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:17:07 2010 -0200" }, "message": "[media] V4L: remove V4L1 compatibility mode\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "12007419b766b316998499bd07c6586928230729", "tree": "145153db892dc38ec6f7f1203f9c3bcf8cf1d250", "parents": [ "e330289ed40f76819d6a13e682203c6fc9a86304" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Fri Dec 17 14:39:29 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:17:00 2010 -0200" }, "message": "[media] Add a keymap for Pixelview 002-T remote\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "0e835087dfe7db19f1f072046f5e116d4ec6662b", "tree": "98caa6d12580520f2ead3264008eb0f7503be482", "parents": [ "829ba9fe34246f1f5e813b6bf84171d36e776734" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Wed Nov 17 02:13:39 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:16:55 2010 -0200" }, "message": "[media] lirc_dev: add some __user annotations\n\nSparse complains because there are no __user annotations.\n\ndrivers/media/rc/lirc_dev.c:156:27: warning:\n\tincorrect type in initializer (incompatible argument 2 (different address spaces))\ndrivers/media/rc/lirc_dev.c:156:27: expected int ( *read )( ... )\ndrivers/media/rc/lirc_dev.c:156:27: got int ( extern [toplevel] *\u003cnoident\u003e )( ... )\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nAcked-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "829ba9fe34246f1f5e813b6bf84171d36e776734", "tree": "a66b938c4a8db2e3c4687e07b082fcea48202b01", "parents": [ "3938e0cfeb812e7b66f4e1cb6e34eb2e6864c6a2" ], "author": { "name": "David Härdeman", "email": "david@hardeman.nu", "time": "Fri Nov 19 20:43:27 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:16:54 2010 -0200" }, "message": "[media] rc-core: fix some leftovers from the renaming patches\n\nFix some minor comments etc which are leftover from the old naming scheme.\n\nSigned-off-by: David Härdeman \u003cdavid@hardeman.nu\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "d100e659b61a735c3343b3d82c1c009b04072cdd", "tree": "d80eedc6a9a51787b4fd2307977b9886a316f122", "parents": [ "2f4f58d689dd71dea67407b74405a3c43e797cb1" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Nov 17 15:56:53 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:16:52 2010 -0200" }, "message": "[media] rc: use rc_map_ prefix for all rc map tables\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "2f4f58d689dd71dea67407b74405a3c43e797cb1", "tree": "8f02ac4a3c8eccc99ee3dae8468e7e5f4c00995c", "parents": [ "b088ba658b3438056dab4d744701364db3f08b9a" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Nov 17 15:46:09 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:16:51 2010 -0200" }, "message": "[media] rc: Name RC keymap tables as rc_map_table\n\nRemote keytables had different names all over the place. Part of the fault\nis due to a bad naming when rc subsystem was created, but there were lots\nof old names that were still here.\n\nUse a common standard for everything.\n\nPatch generated by this script:\n\nfor i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_scancode,rc_map_table,g \u003c$i \u003ea \u0026\u0026 mv a $i; done\nfor i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_codes_,rc_map_,g \u003c$i \u003ea \u0026\u0026 mv a $i; done\nfor i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,rc_key_map,rc_map_table,g \u003c$i \u003ea \u0026\u0026 mv a $i; done\nfor i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,rc_map_table_size,rc_map_size,g \u003c$i \u003ea \u0026\u0026 mv a $i; done\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "b088ba658b3438056dab4d744701364db3f08b9a", "tree": "6e6ec7ad1c7025595ce173505d88f585b3723fc0", "parents": [ "52b661449aecc47e652a164c0d8078b31e10aca0" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Nov 17 14:28:27 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:16:51 2010 -0200" }, "message": "[media] rc: Properly name the rc_map struct\n\nThe struct that describes a rc mapping had an weird and long name.\nWe should properly name it, to make easier for developers to work\nwith it, and to avoid confusion.\n\nBasically, generated by this script:\n\nfor i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_scancode_table,rc_map,g \u003c$i \u003ea \u0026\u0026 mv a $i; done\nfor i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,rc_tab,rc_map,g \u003c$i \u003ea \u0026\u0026 mv a $i; done\n\n(and manually fixed where needed)\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "52b661449aecc47e652a164c0d8078b31e10aca0", "tree": "42af14cf5b6df82b841ec4bf38f22da54fc4439b", "parents": [ "29e3ec19d5c88d534ced219d3962d67243e4d310" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Nov 17 14:20:52 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:16:50 2010 -0200" }, "message": "[media] rc: Rename remote controller type to rc_type instead of ir_type\n\nfor i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,IR_TYPE,RC_TYPE,g \u003c$i \u003ea \u0026\u0026 mv a $i; done\nfor i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_type,rc_type,g \u003c$i \u003ea \u0026\u0026 mv a $i; done\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "ca86674b8a93ea11c4bb6f4dd0113b1adf1fa841", "tree": "1f51d1aafa28121856b033516a00998a632e2864", "parents": [ "6bda96447cef24fbf97a798b1ea664224d5fdc25" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Nov 17 13:53:11 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:16:50 2010 -0200" }, "message": "[media] Rename all public generic RC functions from ir_ to rc_\n\nThose functions are not InfraRed specific. So, rename them to properly\nreflect it.\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "6bda96447cef24fbf97a798b1ea664224d5fdc25", "tree": "4ab424732b58dfc3b2d0f1b64bd625d67f857cfa", "parents": [ "a6e3b81f6198654207c4e972e7ed91931e53e93c" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Nov 17 13:28:38 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:16:50 2010 -0200" }, "message": "[media] rc: rename the remaining things to rc_core\n\nThe Remote Controller subsystem is meant to be used not only by Infra Red\nbut also for similar types of Remote Controllers. The core is not specific\nto Infra Red. As such, rename:\n\t- ir-core.h to rc-core.h\n\t- IR_CORE to RC_CORE\n\t- namespace inside rc-core.c/rc-core.h\n\nTo be consistent with the other changes.\n\nNo functional change on this patch.\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "a6e3b81f6198654207c4e972e7ed91931e53e93c", "tree": "45653b8a6a40d6c6b2ae2d31bdca69a0900fa478", "parents": [ "bce8d0fe4af4b3a1e46e66cd6116d6389ad0cc22" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Nov 17 10:05:29 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:16:49 2010 -0200" }, "message": "[media] rc: Remove ir-common.h\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "9eae42e5a216059a146b3fbbe24b4fdc0b10c723", "tree": "7c06b8dd7b579deb86ffa249ec4b6a3e372fcbf7", "parents": [ "36d89f7de4a4937848de86d9b35cb03a9f0357e1" ], "author": { "name": "Richard Röjfors", "email": "richard.rojfors@pelagicore.com", "time": "Mon Nov 08 10:45:44 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:16:46 2010 -0200" }, "message": "[media] media: Add timberdale video-in driver\n\nThis patch adds the timberdale video-in driver.\n\nThe video IP of timberdale delivers the video data via DMA.\nThe driver uses the DMA api to handle DMA transfers, and make use\nof the V4L2 video buffers to handle buffers against user space.\n\nIf available the driver uses an encoder to get/set the video standard\n\nSigned-off-by: Richard Röjfors \u003crichard.rojfors@pelagicore.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "2eb258327722de3ed4d84ce1b9add2bad21a0ec4", "tree": "d2f5e21d74e8b3062fc847a3af38221f1362d281", "parents": [ "5b2e303f6df1e0b1a903950c5d613a20c8c71a37" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Fri Nov 12 09:02:40 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:16:38 2010 -0200" }, "message": "[media] ir-kbd-i2c: add rc_dev as a parameter to the driver\n\nThere are several fields on rc_dev that drivers can benefit. Allow drivers\nto pass it as a parameter to the driver.\n\nFor now, the rc_dev parameter is optional. If drivers don\u0027t pass it, create\nthem internally. However, the best is to create rc_dev inside the drivers,\nin order to fill other fields, like open(), close(), driver_name, etc.\nSo, a latter patch making it mandatory and changing the caller drivers is\nwelcome.\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "d8b4b5822f51e2142b731b42c81e3f03eec475b2", "tree": "fce9a9b7ca5031adc95fbd6be118352fb2527da5", "parents": [ "4c7b355df6e7f05304e05f6b7a286e59a5f1cc54" ], "author": { "name": "David Härdeman", "email": "david@hardeman.nu", "time": "Fri Oct 29 16:08:23 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:16:37 2010 -0200" }, "message": "[media] ir-core: make struct rc_dev the primary interface\n\nThis patch merges the ir_input_dev and ir_dev_props structs into a single\nstruct called rc_dev. The drivers and various functions in rc-core used\nby the drivers are also changed to use rc_dev as the primary interface\nwhen dealing with rc-core.\n\nThis means that the input_dev is abstracted away from the drivers which\nis necessary if we ever want to support multiple input devs per rc device.\n\nThe new API is similar to what the input subsystem uses, i.e:\nrc_device_alloc()\nrc_device_free()\nrc_device_register()\nrc_device_unregister()\n\n[mchehab@redhat.com: Fix compilation on mceusb and cx231xx, due to merge conflicts]\nSigned-off-by: David Härdeman \u003cdavid@hardeman.nu\u003e\nAcked-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nTested-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "4c7b355df6e7f05304e05f6b7a286e59a5f1cc54", "tree": "f098aab1e058de26013639a0d7924fdf30a86d7e", "parents": [ "631493ecacd81f1af74de459c1d16f7ffa6c82c0" ], "author": { "name": "David Härdeman", "email": "david@hardeman.nu", "time": "Wed Nov 10 11:04:19 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:16:37 2010 -0200" }, "message": "[media] rc-core: Code cleanup after merging rc-sysfs and rc-map into rc-main\n\n[mchehab@redhat.com: this patch were originally bundled with some renaming\nstuff and with the file merges, as seen at:\nhttps://patchwork.kernel.org/patch/291092/.\n\nInstead of using the original approach, I wrote the rename patches and the\ncode merge as separate changes, then applied the difference on this patch.\nThis way, it is easier to see the real changes at the code, and will be easier\nto merge upstream, especially if some conflict rises on the renaming patches]\n\nSigned-off-by: David Härdeman \u003cdavid@hardeman.nu\u003e\nAcked-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nTested-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "3ffea4988be3f3fa65f2104ba31eff2b5e0e82a0", "tree": "615e94196988cf5c37eeb80953d98fa4d9b91527", "parents": [ "62c6503125389763a74911408d984c5dd09eeb97" ], "author": { "name": "David Härdeman", "email": "david@hardeman.nu", "time": "Fri Oct 29 16:08:12 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:16:36 2010 -0200" }, "message": "[media] ir-core: more cleanups of ir-functions.c\n\ncx88 only depends on VIDEO_IR because it needs ir_extract_bits().\nMove that function to ir-core.h and make it inline.\n\nLots of drivers had dependencies on VIDEO_IR when they really\nwanted IR_CORE.\n\nThe only remaining drivers to depend on VIDEO_IR are bt8xx and\nsaa7134 (ir_rc5_timer_end is the only function exported by\nir-functions).\n\nRename VIDEO_IR -\u003e IR_LEGACY to give a hint to anyone writing or\nconverting drivers to IR_CORE that they do not want a dependency\non IR_LEGACY.\n\nSigned-off-by: David Härdeman \u003cdavid@hardeman.nu\u003e\nAcked-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "62c6503125389763a74911408d984c5dd09eeb97", "tree": "a9b419280d25fca5086d82f8992a1d5843da75f1", "parents": [ "2997137be8eba5bf9c07a24d5fda1f4225f9ca7d" ], "author": { "name": "David Härdeman", "email": "david@hardeman.nu", "time": "Fri Oct 29 16:08:07 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:16:35 2010 -0200" }, "message": "[media] ir-core: remove remaining users of the ir-functions keyhandlers\n\nThis patch removes the remaining usages of the ir_input_nokey() and\nir_input_keydown() functions provided by drivers/media/IR/ir-functions.c\nby using the corresponding functionality in ir-core instead.\n\nSigned-off-by: David Härdeman \u003cdavid@hardeman.nu\u003e\nAcked-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "2997137be8eba5bf9c07a24d5fda1f4225f9ca7d", "tree": "98e386a7cc5303567183e4effacf8212e638e7af", "parents": [ "00df055ae315c9c8792dc4d012e6ad9c4d527e87" ], "author": { "name": "David Härdeman", "email": "david@hardeman.nu", "time": "Fri Oct 29 16:08:02 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:16:35 2010 -0200" }, "message": "[media] ir-core: convert drivers/media/video/cx88 to ir-core\n\nThis patch converts the cx88 driver (for sampling hw) to use the\ndecoders provided by ir-core instead of the separate ones provided\nby ir-functions (and gets rid of those).\n\nThe value for MO_DDS_IO had a comment saying it corresponded to\na 4kHz samplerate. That comment was unfortunately misleading. The\nactual samplerate was something like 3250Hz.\n\nThe current value has been derived by analyzing the elapsed time\nbetween interrupts for different values (knowing that each interrupt\ncorresponds to 32 samples).\n\nThanks to Mariusz Bialonczyk \u003cmanio@skyboo.net\u003e for testing my patches\n(about one a day for two weeks!) on actual hardware.\n\nSigned-off-by: David Härdeman \u003cdavid@hardeman.nu\u003e\nAcked-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "00df055ae315c9c8792dc4d012e6ad9c4d527e87", "tree": "9edad9db1aee2b40ab3e8b920700ac32ab2f2e9c", "parents": [ "bf797165f099296b622bcdcea1126a113e0aaac4" ], "author": { "name": "Jarkko Nikula", "email": "jhnikula@gmail.com", "time": "Fri Oct 29 11:31:39 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 29 08:16:35 2010 -0200" }, "message": "[media] radio-si4713: Add regulator framework support\n\nConvert the driver to use regulator framework instead of set_power callback.\nThis with gpio_reset platform data provide cleaner way to manage chip VIO,\nVDD and reset signal inside the driver.\n\nSigned-off-by: Jarkko Nikula \u003cjhnikula@gmail.com\u003e\nCc: Eduardo Valentin \u003ceduardo.valentin@nokia.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "8cad7f06e3b1d3f9a28bb7385e8fc09d5e1bf84c", "tree": "128fc5d979cb590b68ff05366dff93065bdd7ebe", "parents": [ "92d7c9b2312474ce1259d71b4e50e01ae9fa95ea", "0e4d413af1a9ddd12f82617734eb535007e186a8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 20 10:35:04 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 20 10:35:04 2010 -0800" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:\n [media] gspca - sonixj: Better handling of the bridge registers 0x01 and 0x17\n [media] gspca - sonixj: Add the bit definitions of the bridge reg 0x01 and 0x17\n [media] gspca - sonixj: Set the flag for some devices\n [media] gspca - sonixj: Add a flag in the driver_info table\n [media] gspca - sonixj: Fix a bad probe exchange\n [media] gspca - sonixj: Move bridge init to sd start\n [media] bttv: remove unneeded locking comments\n [media] bttv: fix mutex use before init (BZ#24602)\n [media] Don\u0027t export format_by_forcc on two different drivers\n" }, { "commit": "8efc1a1a22e6daf9d669e6095460c77df683c325", "tree": "b7d74f31bb3bee58df82fe058cbc061e659b4e88", "parents": [ "74280817e5013af83089a5dd511f6fb3b2362e09", "673eb9ff33e26ee6f4278cdab06749aef1bbef5b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 17 09:28:17 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 17 09:28:17 2010 -0800" }, "message": "Merge branch \u0027bkl_removal\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6\n\n* \u0027bkl_removal\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:\n [media] uvcvideo: Convert to unlocked_ioctl\n [media] uvcvideo: Lock stream mutex when accessing format-related information\n [media] uvcvideo: Move mmap() handler to uvc_queue.c\n [media] uvcvideo: Move mutex lock/unlock inside uvc_free_buffers\n [media] uvcvideo: Lock controls mutex when querying menus\n [media] v4l2-dev: fix race condition\n [media] V4L: improve the BKL replacement heuristic\n [media] v4l2-dev: use mutex_lock_interruptible instead of plain mutex_lock\n [media] cx18: convert to unlocked_ioctl\n [media] radio-timb: convert to unlocked_ioctl\n [media] sh_vou: convert to unlocked_ioctl\n [media] cafe_ccic: replace ioctl by unlocked_ioctl\n [media] et61x251_core: trivial conversion to unlocked_ioctl\n [media] sn9c102: convert to unlocked_ioctl\n [media] BKL: trivial ioctl -\u003e unlocked_ioctl video driver conversions\n [media] typhoon: convert to unlocked_ioctl\n [media] si4713: convert to unlocked_ioctl\n [media] tea5764: convert to unlocked_ioctl\n [media] cadet: use unlocked_ioctl\n [media] BKL: trivial BKL removal from V4L2 radio drivers\n" }, { "commit": "a757ee2216211278680dd8ac869aabe7b4a9970d", "tree": "1b1e2f44ba7937252b7d8b7cbad292cd5c2b1261", "parents": [ "9a1f8b34aa539000da17a06235e4bec254d0bfb5" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Dec 02 01:57:03 2010 -0200" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Dec 02 01:59:10 2010 -0200" }, "message": "[media] Don\u0027t export format_by_forcc on two different drivers\n\nDrivers should append their name on exported symbols, to avoid\nconflicts with allyesconfig:\n\ndrivers/staging/built-in.o: In function `format_by_fourcc\u0027:\n/home/v4l/work_trees/linus/drivers/staging/cx25821/cx25821-video.c:96: multiple definition of `format_by_fourcc\u0027\ndrivers/media/built-in.o:/home/v4l/work_trees/linus/drivers/media/common/saa7146_video.c:88: first defined here\n\nLet\u0027s rename both occurences with a small shellscript:\n\nfor i in drivers/staging/cx25821/*.[ch]; do sed s,format_by_fourcc,cx25821_format_by_fourcc,g \u003c$i \u003ea \u0026\u0026 mv a $i; done\nfor i in drivers/media/common/saa7146*.[ch]; do sed s,format_by_fourcc,saa7146_format_by_fourcc,g \u003c$i \u003ea \u0026\u0026 mv a $i; done\nfor i in include/media/saa7146*.[ch]; do sed s,format_by_fourcc,saa7146_format_by_fourcc,g \u003c$i \u003ea \u0026\u0026 mv a $i; done\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "879aa24d6394aa04b690a600a41ff500441ad384", "tree": "024886e8a84ab3f7e88c1e2c5aeceae28cc344bb", "parents": [ "2877842de8cbf6272b0a851cb12587b7dd8c2afb" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Fri Nov 26 06:47:28 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Dec 01 20:10:19 2010 -0200" }, "message": "[media] V4L: improve the BKL replacement heuristic\n\nThe BKL replacement mutex had some serious performance side-effects on\nV4L drivers. It is replaced by a better heuristic that works around the\nworst of the side-effects.\n\nRead the v4l2-dev.c comments for the whole sorry story. This is a\ntemporary measure only until we can convert all v4l drivers to use\nunlocked_ioctl.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "9a1f8b34aa539000da17a06235e4bec254d0bfb5", "tree": "0e74c1dfc3784aa31a5945c602c5fd1a16a1b388", "parents": [ "aa2d8cbe169b7328eeabc9e2debccf5aee6f9199" ], "author": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Fri Sep 24 10:16:44 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Mon Nov 22 11:56:26 2010 -0200" }, "message": "[media] v4l: Remove module_name argument to the v4l2_i2c_new_subdev* functions\n\nThe argument isn\u0027t used anymore by the functions, remove it.\n\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "0851668fdd97e526b2a41f794b785c204dd3d3e0", "tree": "4ef7c20a8be8393006c6fe9627eb29dd30877d61", "parents": [ "00ebb6382b8d9c7c15b5f8ad230670d8161d38dd", "7655e594945289b418af39f6669fea4666a7b520" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 28 09:35:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 28 09:35:11 2010 -0700" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (505 commits)\n [media] af9015: Fix max I2C message size when used with tda18271\n [media] IR: initialize ir_raw_event in few more drivers\n [media] Guard a divide in v4l1 compat layer\n [media] imon: fix nomouse modprobe option\n [media] imon: remove redundant change_protocol call\n [media] imon: fix my egregious brown paper bag w/rdev/idev split\n [media] cafe_ccic: Configure ov7670 correctly\n [media] ov7670: allow configuration of image size, clock speed, and I/O method\n [media] af9015: support for DigitalNow TinyTwin v3 [1f4d:9016]\n [media] af9015: map DigitalNow TinyTwin v2 remote\n [media] DigitalNow TinyTwin remote controller\n [media] af9015: RC fixes and improvements\n videodev2.h.xml: Update to reflect the latest changes at videodev2.h\n [media] v4l: document new Bayer and monochrome pixel formats\n [media] DocBook/v4l: Add missing formats used on gspca cpia1 and sn9c2028\n [media] firedtv: add parameter to fake ca_system_ids in CA_INFO\n [media] tm6000: fix a macro coding style issue\n tm6000: Remove some ugly debug code\n [media] Nova-S-Plus audio line input\n [media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers\n ...\n" }, { "commit": "3a99c6319064af3f2e18eb929f638d555dbf7a62", "tree": "e611927f41142123dc8efed7e07a3a91151edb01", "parents": [ "1dfd166e93f98892aa4427069a23ed73259983c8", "49327ad2bbbaf1945d5ba431522201574219d150" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 25 07:59:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Oct 25 07:59:01 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (75 commits)\n Input: wacom - specify Cinitq supported tools\n Input: ab8500-ponkey - fix IRQ freeing in error path\n Input: adp5588-keys - use more obvious i2c_device_id name string\n Input: ad7877 - switch to using threaded IRQ\n Input: ad7877 - use attribute group to control visibility of attributes\n Input: serio - add support for PS2Mult multiplexer protocol\n Input: wacom - properly enable runtime PM\n Input: ad7877 - filter events where pressure is beyond the maximum\n Input: ad7877 - implement EV_KEY:BTN_TOUCH reporting\n Input: ad7877 - implement specified chip select behavior\n Input: hp680_ts_input - use cancel_delayed_work_sync()\n Input: mousedev - correct lockdep annotation\n Input: ads7846 - switch to using threaded IRQ\n Input: serio - support multiple child devices per single parent\n Input: synaptics - simplify pass-through port handling\n Input: add ROHM BU21013 touch panel controller support\n Input: omap4-keypad - wake-up on events \u0026 long presses\n Input: omap4-keypad - fix interrupt line configuration\n Input: omap4-keypad - SYSCONFIG register configuration\n Input: omap4-keypad - use platform device helpers\n ...\n" }, { "commit": "64fb58092e025235dc7fdcebeffee1516c79464d", "tree": "f01d2d63bf17158e1f8b8d49e486f8cfc2a1e442", "parents": [ "74c8e3ad0e5296d65be091bdc0d3ae9f72f7e019" ], "author": { "name": "Antti Palosaari", "email": "crope@iki.fi", "time": "Fri Oct 22 20:23:31 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Sat Oct 23 11:11:52 2010 -0200" }, "message": "[media] DigitalNow TinyTwin remote controller\n\nSigned-off-by: Antti Palosaari \u003ccrope@iki.fi\u003e\nCc: Renura Enterprises Pty Ltd \u003crenura@digitalnow.com.au\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "fcb9757333df37cf4a7feccef7ef6f5300643864", "tree": "b04e8567ef7fd1d6a67c291122dbd2476c38bcc8", "parents": [ "cb0ed22270129b980257fa9c83b152f09ecd9eda" ], "author": { "name": "lawrence rust", "email": "lawrence@softsystem.co.uk", "time": "Mon Oct 18 07:06:02 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Sat Oct 23 01:17:52 2010 -0200" }, "message": "[media] Nova-S-Plus audio line input\n\nThis patch adds audio DMA capture and ALSA mixer elements for the line\ninput jack of the Hauppauge Nova-S-plus DVB-S PCI card. The Nova-S-plus\nhas a WM8775 ADC that is currently not detected. This patch enables\nthis chip and exports volume, balance mute and ALC elements for ALSA\nmixer controls.\n\n[mchehab@redhat.com: Fix CodingStyle issues]\nSigned-off-by: Lawrence Rust \u003clawrence@softsystem.co.uk\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "2334e7902e4ff3d61b5dd808858f2ac3e276a551", "tree": "8c4b73c33841ed181784dd75dc07564b7073d6d4", "parents": [ "d4c0312363ad16a9991521aec7e19ffe85d49c2a" ], "author": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Fri Sep 24 08:39:19 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Fri Oct 22 21:53:33 2010 -0200" }, "message": "[media] sh_vou: Don\u0027t use module names to load I2C modules\n\nWith the v4l2_i2c_new_subdev* functions now supporting loading modules\nbased on modaliases, remove the module names hardcoded in platform data\nand pass a NULL module name to those functions.\n\nAll corresponding I2C modules have been checked, and all of them include\na module aliases table with names corresponding to what the sh_vou\nplatform data uses.\n\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "4ae871088a9ddead041c9e91e01435e4ed5dda08", "tree": "85dc144df438fc54c5e7a7913c552df04743e0d2", "parents": [ "5401c2db1ee0adc89dfb5d4b1a6dc1f2efe38854" ], "author": { "name": "Antti Palosaari", "email": "crope@iki.fi", "time": "Sun Oct 17 16:16:13 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Fri Oct 22 21:24:26 2010 -0200" }, "message": "[media] Anysee remote controller\n\nAnysee remote controller keytable. Uses NEC address 0x08.\n\nSigned-off-by: Antti Palosaari \u003ccrope@iki.fi\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "024fafbac36b176d978ccd0fb1cae1fbc38c7fee", "tree": "02b52bf8c6104ab4a8f7bcdf87741aee4b219f3b", "parents": [ "dc4589c814a3a50a4cfc2077690fc7fd397308c8" ], "author": { "name": "Jonathan Corbet", "email": "corbet@lwn.net", "time": "Tue Oct 19 21:32:11 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 13:45:28 2010 -0200" }, "message": "[media] Add the via framebuffer camera controller driver\n\nAdd a driver for the video capture port on VIA integrated chipsets. This\nversion has a remaining OLPCism or two and expects to be talking to an\nov7670; those can be improved as the need arises.\n\nThis work was supported by the One Laptop Per Child project.\nThanks to Laurent Pinchart for a number of useful comments.\n\nCc: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nSigned-off-by: Jonathan Corbet \u003ccorbet@lwn.net\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "4651918a4afdd49bdea21d2f919b189ef17a6399", "tree": "73a4e3b5f7da1d655a059bb9b69135cf6f395e02", "parents": [ "fb249ca61d469a9cb666ba7e1d992787dc6bad82" ], "author": { "name": "Maxim Levitsky", "email": "maximlevitsky@gmail.com", "time": "Sat Oct 16 19:56:28 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 10:59:47 2010 -0200" }, "message": "[media] IR: extend ir_raw_event and do refactoring\n\nAdd new event types for timeout \u0026 carrier report\nMove timeout handling from ir_raw_event_store_with_filter to\nir-lirc-codec, where it is really needed.\nNow lirc bridge ensures proper gap handling.\nExtend lirc bridge for carrier \u0026 timeout reports\n\nNote: all new ir_raw_event variables now should be initialized\nlike that: DEFINE_IR_RAW_EVENT(ev);\n\nTo clean an existing event, use init_ir_raw_event(\u0026ev);\n\nSigned-off-by: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nAcked-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "111ac84a80199654db55c06e2565d4ab343c135d", "tree": "afa365528ce77ec78ad58aff0eb80b5edd99ed2f", "parents": [ "fba39807ceba3e2aab022fa8c7181a322fe12675" ], "author": { "name": "Sergey Ivanov", "email": "123kash@gmail.com", "time": "Mon Aug 09 10:18:32 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 07:55:55 2010 -0200" }, "message": "[media] Twinhan 1027 + IR Port support\n\nPatch add support of TwinHan 1027 DVB-S card.\n\nRefreshed version of https://patchwork.kernel.org/patch/79753/ patch.\n(adapted for the new IR system), still works.\n\nDVB-S support come from a patch originally authored by\nManu Abraham (abraham.manu@gmail.com).\nIR Port support were added by Sergey.\n\nCc: Manu Abraham \u003cabraham.manu@gmail.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "3e9c2b8477059c3ae39ed9373fddd23e4c754acc", "tree": "592b143b00c8ec6d14f36c3f862a933c71beb6fc", "parents": [ "a7d5bbcf9c77596f94154906ca54ce8e28945a68" ], "author": { "name": "Sylwester Nawrocki", "email": "s.nawrocki@samsung.com", "time": "Mon Oct 11 13:33:57 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 07:55:49 2010 -0200" }, "message": "[media] Add driver for Siliconfile SR030PC30 VGA camera\n\nAdd an I2C/v4l2-subdev driver for Siliconfile SR030PC30 VGA\ncamera sensor with Image Signal Processor. SR030PC30 is\nthe low resolution camera sensor on Samsung Aquila boards.\n\nSigned-off-by: Sylwester Nawrocki \u003cs.nawrocki@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "5f3cc4474cdeab3ee44962fd752baec24e8fecec", "tree": "5c0255cb2c8f531a2b139f700a210c855dea19aa", "parents": [ "28f06ff4b75a309d9255567b3a15b6a5bf63747d" ], "author": { "name": "Sylwester Nawrocki", "email": "s.nawrocki@samsung.com", "time": "Thu Oct 07 10:06:16 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 07:55:47 2010 -0200" }, "message": "[media] s5p-fimc: Add camera capture support\n\nAdd a video device driver per each FIMC entity to support\nthe camera capture input mode. Video capture node is registered\nonly if CCD sensor data is provided through driver\u0027s platfrom data\nand board setup code.\n\nSigned-off-by: Sylwester Nawrocki \u003cs.nawrocki@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nReviewed-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "32e1f777274b0e642a8af381a4e07d7858506f37", "tree": "cec5cc22b3f40c841a052dd9b609d22e3ce8818d", "parents": [ "06e17821b5a689543a890861e5a08e1f9586e2bf" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Tue Oct 05 12:32:41 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 07:55:40 2010 -0200" }, "message": "[media] V4L: add IMX074 sensor chip ID\n\nChip identification register contains the value 0x74.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "2f6e2404799ad610317157b73169c109788da0b0", "tree": "576f417079dc40fe25be7916bda6402a7213f952", "parents": [ "bdc621fcedf031426551caed4e7517603690fad1" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Tue Oct 05 11:52:45 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 07:55:38 2010 -0200" }, "message": "[media] SoC Camera: add driver for OV6650 sensor\n\nThis patch provides a V4L2 SoC Camera driver for OV6650 camera sensor, found\non OMAP1 SoC based Amstrad Delta videophone.\n\nSince I have no experience with camera sensors, and the sensor documentation I\nwas able to find was not very comprehensive, I left most settings at their\ndefault (reset) values, except for:\n- those required for proper mediabus parameters and picture geometry and\n format setup,\n- those used by controls.\nResulting picture quality may be far from perfect, but better than nothing.\n\nIn order to be able to get / set the sensor frame rate from userspace, I\ndecided to provide two not yet SoC camera supported operations, g_parm and\ns_parm. These can be used after applying patch 4/6 from this series,\n\"SoC Camera: add support for g_parm / s_parm operations\".\n\nCreated and tested against linux-2.6.36-rc5 on Amstrad Delta.\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "bdc621fcedf031426551caed4e7517603690fad1", "tree": "6f3c23baa2004b97f736cfa0976f357cf9993c0c", "parents": [ "0915d559a062f8f1034cf160f4af060df47dd0a3" ], "author": { "name": "Janusz Krzysztofik", "email": "jkrzyszt@tis.icnet.pl", "time": "Thu Sep 30 08:35:49 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 07:55:37 2010 -0200" }, "message": "[media] SoC Camera: add driver for OMAP1 camera interface\n\nThis is a V4L2 driver for TI OMAP1 SoC camera interface.\n\nBoth videobuf-dma versions are supported, contig and sg, selectable with a\nmodule option. The former uses less processing power, but often fails to\nallocate contignuous buffer memory. The latter is free of this problem, but\ngenerates tens of DMA interrupts per frame. If contig memory allocation ever\nfails, the driver falls back to sg automatically on next open, but still can\nbe switched back to contig manually. Both paths work stable for me, even\nunder heavy load, on my OMAP1510 based Amstrad Delta videophone, that is the\noldest, least powerfull OMAP1 implementation.\n\nThe interface generally works in pass-through mode. Since input data byte\nendianess can be swapped, it provides up to two v4l2 pixel formats per each of\nseveral soc_mbus formats that have their swapped endian counterparts.\n\nBoards using this driver can provide it with the following platform data:\n- if and what freqency clock is expected by an on-board camera sensor,\n- what is the maximum pixel clock that should be accepted from the sensor,\n- what is the polarity of the sensor provided pixel clock,\n- if the interface GPIO line is connected to a sensor reset/powerdown input\n and what is the input polarity.\n\nCreated and tested against linux-2.6.36-rc5 on Amstrad Delta.\n\nSigned-off-by: Janusz Krzysztofik \u003cjkrzyszt@tis.icnet.pl\u003e\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "0915d559a062f8f1034cf160f4af060df47dd0a3", "tree": "8e94cf1b3eed522193c1a0939dcc96aeb2ced8ff", "parents": [ "669470a8cc3c98acf9663a908d7cc596fe728927" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Tue Aug 03 07:57:47 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 07:55:36 2010 -0200" }, "message": "[media] v4l2-mediabus: Add pixelcodes for BGR565 formats\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nAcked-by: Robert Jarzmik \u003crobert.jarzmik@free.fr\u003e\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "be1f985ffa49467f604318182616678b3e5184fd", "tree": "3445d817db48005ed442fd03009ac6ff68e84514", "parents": [ "d322bf4ab2b513d03bd53b4436dbf6f2a36a7a76" ], "author": { "name": "Jarod Wilson", "email": "jarod@redhat.com", "time": "Fri Oct 08 17:24:21 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:18:34 2010 -0200" }, "message": "[media] IR/lirc: further ioctl portability fixups\n\n\u003eFrom Joris van Rantwijk \u003cjorispubl@xs4all.nl\u003e:\n\n\tI tested lirc_serial and found that it works fine.\n\tExcept the LIRC ioctls do not work in my 64-bit-kernel/32-bit-user\n\tsetup. I added compat_ioctl entries in the drivers to fix this.\n\n\tWhile doing so, I noticed inconsistencies in the argument type of\n\tthe LIRC ioctls. All ioctls are declared in lirc.h as having argument\n\ttype __u32, however there are a few places where the driver calls\n\tget_user/put_user with an unsigned long argument.\n\n\tThe patch below changes lirc_dev and lirc_serial to use __u32 for all\n\tioctl arguments, and adds compat_ioctl entries.\n\tIt should probably also be done in the other low-level drivers,\n\tbut I don\u0027t have hardware to test those.\n\nI\u0027ve dropped the .compat_ioctl addition from Joris\u0027 original patch,\nas I swear the non-compat definition should now work for both 32-bit\nand 64-bit userspace. Technically, I think we still need/want a\nin getting a reply to you).\n\nReported-by: Joris van Rantwijk \u003cjorispubl@xs4all.nl\u003e\nSigned-off-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "20d747b4c44ba1a5c8604a88dc898260a2a3bcf8", "tree": "4ba777c1face8b7cd71239062d71361b9bb2a403", "parents": [ "860d1e29205860ebab539e41011e765e1bc417a1" ], "author": { "name": "Antti Palosaari", "email": "crope@iki.fi", "time": "Mon Oct 11 20:25:44 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:18:10 2010 -0200" }, "message": "[media] Total Media In Hand remote controller\n\nSigned-off-by: Antti Palosaari \u003ccrope@iki.fi\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "860d1e29205860ebab539e41011e765e1bc417a1", "tree": "4cf865a6c7ceb11d130096e5104e650eab959af4", "parents": [ "c12d2f746b34baf9e97cae06a8757dc6be387e62" ], "author": { "name": "Antti Palosaari", "email": "crope@iki.fi", "time": "Mon Oct 11 20:19:23 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:18:09 2010 -0200" }, "message": "[media] rename rc-msi-digivox.c -\u003e rc-msi-digivox-iii.c\n\nRename remote controller driver I added earlier.\n\nSigned-off-by: Antti Palosaari \u003ccrope@iki.fi\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "c12d2f746b34baf9e97cae06a8757dc6be387e62", "tree": "070f3aeba04d45a3a78864bbc751255687ee299f", "parents": [ "ad7fac348470b6b2ac0b4579e3bdb6da5a6166e0" ], "author": { "name": "Antti Palosaari", "email": "crope@iki.fi", "time": "Mon Oct 11 19:12:58 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:18:08 2010 -0200" }, "message": "[media] MSI DIGIVOX mini II remote controller\n\nSigned-off-by: Antti Palosaari \u003ccrope@iki.fi\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "ad7fac348470b6b2ac0b4579e3bdb6da5a6166e0", "tree": "c9b3b16e558245b74561ba65af8dd6c104744d12", "parents": [ "3f37fcedb2a104ba9d70a5a9c4c89abe4ef075d6" ], "author": { "name": "Antti Palosaari", "email": "crope@iki.fi", "time": "Mon Oct 11 18:54:13 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:18:07 2010 -0200" }, "message": "[media] A-Link DTU(m) remote controller\n\nSigned-off-by: Antti Palosaari \u003ccrope@iki.fi\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "3f37fcedb2a104ba9d70a5a9c4c89abe4ef075d6", "tree": "8ceb9b7cabc47b98bc1d6b1f619d6db4d63d7a21", "parents": [ "a7a177877cbfa0de15410a4d00984bdb2aaf4ea6" ], "author": { "name": "Antti Palosaari", "email": "crope@iki.fi", "time": "Mon Oct 11 17:31:59 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:18:06 2010 -0200" }, "message": "[media] TwinHan AzureWave AD-TU700(704J) remote controller\n\nSigned-off-by: Antti Palosaari \u003ccrope@iki.fi\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "a7a177877cbfa0de15410a4d00984bdb2aaf4ea6", "tree": "a476d8b16e78a3958d723cddd56c8e9b15609ec7", "parents": [ "ae54a699c3d625ae2b4f87350ecb97ba034a656b" ], "author": { "name": "Antti Palosaari", "email": "crope@iki.fi", "time": "Mon Oct 11 16:08:13 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:18:05 2010 -0200" }, "message": "[media] LeadTek Y04G0051 remote controller keytable\n\nSigned-off-by: Antti Palosaari \u003ccrope@iki.fi\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "ae54a699c3d625ae2b4f87350ecb97ba034a656b", "tree": "531f6032d0612292be6f76f7837d0949b39092ab", "parents": [ "ff533801bd9fa91fc61053900fd40b10132427c0" ], "author": { "name": "Antti Palosaari", "email": "crope@iki.fi", "time": "Mon Oct 11 10:59:48 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:18:04 2010 -0200" }, "message": "[media] AverMedia RM-KS remote controller keytable\n\nImported from af9015.h. Initial keytable was from\nJose Alberto Reguero \u003cjareguero@telefonica.net\u003e and\nFelipe Morales Moreno \u003cfelipe.morales.moreno@gmail.com\u003e\n\nSigned-off-by: Antti Palosaari \u003ccrope@iki.fi\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "ff533801bd9fa91fc61053900fd40b10132427c0", "tree": "3e5916b0a9073f282c9290350e5be55b31a68c0d", "parents": [ "a3d34e6ac362dafdb7aa0c3438b105c7822cdcd1" ], "author": { "name": "Antti Palosaari", "email": "crope@iki.fi", "time": "Mon Oct 11 08:24:00 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:18:03 2010 -0200" }, "message": "[media] Digittrade DVB-T USB Stick remote controller keytable\n\nDigittrade DVB-T USB Stick remote controller.\nImported from af9015.h. Initial keytable was from Alain Kalker \u003cmiki@dds.nl\u003e\n\nSigned-off-by: Antti Palosaari \u003ccrope@iki.fi\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "a3d34e6ac362dafdb7aa0c3438b105c7822cdcd1", "tree": "79a2d3b303f5ae808272d9906b42103d3af95682", "parents": [ "76ba9c4d50c66ae43f2694c6ad652ddd4c3be000" ], "author": { "name": "Antti Palosaari", "email": "crope@iki.fi", "time": "Mon Oct 11 07:36:54 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:18:02 2010 -0200" }, "message": "[media] TrekStor DVB-T USB Stick remote controller\n\nImported from af9015.h.\nInitial keytable was from Marc Schneider \u003cmacke@macke.org\u003e\n\nSigned-off-by: Antti Palosaari \u003ccrope@iki.fi\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "76ba9c4d50c66ae43f2694c6ad652ddd4c3be000", "tree": "65060cabe78812c611638a8ae9642e880a349b23", "parents": [ "68617b31b39fdfd7920d55710994755e7259b16b" ], "author": { "name": "Antti Palosaari", "email": "crope@iki.fi", "time": "Mon Oct 11 06:56:46 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:18:01 2010 -0200" }, "message": "[media] MSI DIGIVOX mini III remote controller keytable\n\nMSI DIGIVOX mini III remote controller. Uses NEC extended 0x61d6.\nThis remote seems to be same as rc-kworld-315u.c. Anyhow, add new remote\nsince rc-kworld-315u.c lacks NEC extended address byte.\n\nSigned-off-by: Antti Palosaari \u003ccrope@iki.fi\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "68617b31b39fdfd7920d55710994755e7259b16b", "tree": "6d7950b49c584b278c32f49b91d378dd4c97cd06", "parents": [ "675375d7ae14849d5698c771aff964a0ea2ac404" ], "author": { "name": "Antti Palosaari", "email": "crope@iki.fi", "time": "Thu Oct 07 21:56:48 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:18:01 2010 -0200" }, "message": "[media] TerraTec remote controller keytable\n\nTerraTec slim remote, 7 rows, 4 columns. Uses NEC extended 0x02bd.\n\nSigned-off-by: Antti Palosaari \u003ccrope@iki.fi\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "22c00854f3db563427527a8f71c20bd3943b13e0", "tree": "9b1e8dcbcc44b55ceaa4c9b89734dc55a8bec2ff", "parents": [ "7242063018c06977dc6825026b3075076e6f227b" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu Sep 30 16:55:07 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:16:59 2010 -0200" }, "message": "[media] lirc: Make struct file_operations pointer const\n\nstruct file_operations was made const in the drivers, but not in struct\nlirc_driver:\n\ndrivers/staging/lirc/lirc_it87.c:365: warning: initialization discards qualifiers from pointer target type\ndrivers/staging/lirc/lirc_parallel.c:571: warning: initialization discards qualifiers from pointer target type\ndrivers/staging/lirc/lirc_serial.c:1073: warning: initialization discards qualifiers from pointer target type\ndrivers/staging/lirc/lirc_sir.c:482: warning: initialization discards qualifiers from pointer target type\ndrivers/staging/lirc/lirc_zilog.c:1284: warning: assignment discards qualifiers from pointer target type\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "3fd8e647eaa76a1eb5bdd0fcecf49364a089b71d", "tree": "262fec3628c13f004a49477fc19cc1ff20c12521", "parents": [ "e3cfd447d01cf723ccda0ad6bfa2e85b73d3d747" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Thu Sep 30 09:29:37 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:06:19 2010 -0200" }, "message": "V4L/DVB: v4l2-common: Move v4l2_find_nearest_format from videodev2.h to v4l2-common.h\n\nThis function is an internal API and belongs in v4l2-common.h, not\nvideodev.h. The return pointer and probe argument should be const as well.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "57bee29d6e8cf721864fa47a18366bee5ff24f21", "tree": "eec0e9a15386db2bbe041f9e39d60075614c5adc", "parents": [ "79c6ff93c74e793ccceb464ee3698478c812ce79" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Tue Aug 17 14:29:51 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:06:18 2010 -0200" }, "message": "V4L/DVB: soc-camera: allow only one video queue per device\n\nMultiple user-space application instances can open the same video device, but\nit only makes sense for one of them to manage the videobuffer queue and set\nvideo format of the device. Restrict soc-camera respectively.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "0e0809a58869e3e422985f868ad5e0da1fc0ba85", "tree": "e4895d60a050e15d6c4b21aa7dbc4090199efdf3", "parents": [ "08bff03ed697a583612b62a6ac566bd5bce98012" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Sun Sep 26 09:01:26 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:06:14 2010 -0200" }, "message": "V4L/DVB: videobuf: add queue argument to videobuf_waiton()\n\nvideobuf_waiton() must unlock and relock ext_lock if it has to wait.\nFor that to happen it needs the videobuf_queue pointer.\n\nDon\u0027t attempt to unlock/relock q-\u003eext_lock unless it was locked in the\nfirst place.\n\nvb-\u003estate has to be protected by a spinlock to be safe.\n\nThis patch is based on code from Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e.\n\n[mchehab@redhat.com: add extra argument to a few missing places]\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "08bff03ed697a583612b62a6ac566bd5bce98012", "tree": "733cf5b266cd7c5b064209dccd7ad6f18d989101", "parents": [ "97397687886aa8ecd4ec603fab9e70e970c11597" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Mon Sep 20 17:39:46 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:06:14 2010 -0200" }, "message": "V4L/DVB: videobuf: add ext_lock argument to the queue init functions\n\nAdd an ext_lock argument to the videobuf init functions. This allows\ndrivers to pass the vdev-\u003elock pointer (or any other externally held lock)\nto videobuf. For now all drivers just pass NULL.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "97397687886aa8ecd4ec603fab9e70e970c11597", "tree": "339d460b43d2ec7206c9d147d2ad6f8fcbfa3870", "parents": [ "ee6869afc922a9849979e49bb3bbcad794872fcb" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Mon Sep 20 17:24:30 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:06:14 2010 -0200" }, "message": "V4L/DVB: videobuf: prepare to make locking optional in videobuf\n\nCurrently videobuf uses the vb_lock mutex to lock its data structures.\nBut this locking will (optionally) move into the v4l2 core, which means\nthat in that case vb_lock shouldn\u0027t be used since the external lock is already\nheld.\n\nPrepare for this by adding a pointer to such an external mutex and\ndon\u0027t lock if that pointer is set.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "ee6869afc922a9849979e49bb3bbcad794872fcb", "tree": "2266050d01da694d04b533a6509873888327108b", "parents": [ "c29fcff3daafbf46d64a543c1950bbd206ad8c1c" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Sun Sep 26 08:47:38 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:06:14 2010 -0200" }, "message": "V4L/DVB: v4l2: add core serialization lock\n\nDrivers can optionally set a pointer to a mutex in struct video_device.\nThe core will use that to lock before calling open, read, write, unlocked_ioctl,\npoll, mmap or release.\n\nUpdated the documentation as well and ensure that v4l2-event knows about the\nlock: it will unlock it before doing a blocking wait on an event and relock it\nafterwards.\n\nEnsure that the \u0027video_is_registered\u0027 check is done when the lock is held:\na typical disconnect will take the lock as well before unregistering the\ndevice nodes, so to prevent race conditions the video_is_registered check\nshould also be done with the lock held.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "c29fcff3daafbf46d64a543c1950bbd206ad8c1c", "tree": "cd57a91e596b5529a88d6fa45bad461b89d80c0d", "parents": [ "d69f27186c16008540166c8017e9d4db2b477588" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Sun Sep 26 08:20:13 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:06:14 2010 -0200" }, "message": "V4L/DVB: v4l2-dev: remove get_unmapped_area\n\nThe get_unmapped_area file operation is unused. Remove.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "ee08940531193ccce680ca3c2f17ecc497c4bb67", "tree": "5050592376ff4410e091f205c28510de345c0103", "parents": [ "c72ba8e6ae7376d20e509a9a54a2dd45fb483fc2" ], "author": { "name": "Jarod Wilson", "email": "jarod@redhat.com", "time": "Wed Sep 15 15:31:12 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:06:07 2010 -0200" }, "message": "V4L/DVB: IR: export ir_keyup so imon driver can use it directly\n\nThe imon driver currently reimplements its own version of ir_keyup\n(along with key release timer functionality also already present in the\ncore IR code). A follow-up imon patch will make use of ir_keyup and the\nIR stack\u0027s key release code.\n\nTrivial extraction from David Härdeman\u0027s pending rc-core merge and\ndevice interface abstraction patchset to facilitate merging a patch\nbased on his imon input dev split patch ahead of the larger churn, which\nis slated for post-2.6.37-rc1 (after Dmitry\u0027s large keycode patches are\nmerged in mainline).\n\nSigned-off-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "c72ba8e6ae7376d20e509a9a54a2dd45fb483fc2", "tree": "4f2b407b086309b411e7d7ea80c2a0a71ac604d9", "parents": [ "44243fc2ef99948bc9b046901880885616dd5e89" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Sep 23 01:23:10 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:06:07 2010 -0200" }, "message": "V4L/DVB: saa7134: get rid of I2C_HW_SAA7134\n\nThe only reason for keeping I2C_HW_SAA7134 is to allow setting a\nper-device polling interval. Just move this info to the platform\ndata, allowing drivers to change it per device, where needed.\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "c0c46826274a4da5d9e312d7cfd4ca0806c0a358", "tree": "e3237889f6ee931f674f46ce72f1844796899b77", "parents": [ "8403472f19fea7e7cec7899e998f38b899e59604" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Wed Sep 22 23:24:04 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:06:07 2010 -0200" }, "message": "V4L/DVB: bttv: Move PV951 IR to the right driver\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "1f2052539666bd8b43ed26c9b1c3687628c49ecc", "tree": "f7ecd086502bd6d157a120435fd655be31eb2bc2", "parents": [ "8dd4eddaf7b2acbc4b7aa097d0e2b373e519e97b" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Wed Sep 15 16:36:07 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:06:06 2010 -0200" }, "message": "V4L/DVB: v4l: remove obsolete include/media/v4l2-i2c-drv.h file\n\nThe include/media/v4l2-i2c-drv.h header was used to be able to compile drivers\nin the v4l-dvb hg repository for legacy kernels (mainly pre-2.6.26) without\ncreating an #ifdef mess.\n\nThe hg repository dropped support for kernels \u003c 2.6.26 so we can remove this\nheader. All i2c drivers that used it have now been converted to use proper\ni2c code. The header was a hack, but it did its job well. So I would call\nthis an honorable removal. :-)\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "226c0eeaea6732c686a5f4e06f25e5850cd5dd61", "tree": "e956053de69a2d17d8194945247b853b5c38848d", "parents": [ "563711f16f5d5ee8b639a3d6ee4cef199617009c" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Fri Aug 06 12:48:00 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:05:48 2010 -0200" }, "message": "V4L/DVB: videotext: remove this obsolete API\n\nRemove the vtx (aka videotext aka teletext) API from the v4l2 core.\nThis API was scheduled for removal in kernel 2.6.35.\n\nThe vtx device nodes have been superseded by vbi device nodes\nfor many years. No applications exist that use the vtx support.\nOf the two i2c drivers that actually support this API the saa5249\nhas been impossible to use for a year now and no known hardware\nthat supports this device exists. The saa5246a is theoretically\nsupported by the old mxb boards, but it never actually worked.\n\nIn summary: there is no hardware that can use this API and there\nare no applications actually implementing this API.\n\nThe vtx support still reserves minors 192-223 and we would really\nlike to reuse those for upcoming new functionality. In the unlikely\nevent that new hardware appears that wants to use the functionality\nprovided by the vtx API, then that functionality should be build\naround the sliced VBI API instead.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "d2f918bba7a482bee18cc0ede7791f7d846dd5d0", "tree": "f893a3dab16b3f815f576f08568f17b5d4f1edf9", "parents": [ "9d10f3d7e73d3428555da97134fc597710a55f39" ], "author": { "name": "Malcolm Priestley", "email": "tvboxspy@gmail.com", "time": "Thu Sep 02 17:29:30 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:04:54 2010 -0200" }, "message": "V4L/DVB: Support or LME2510(C) DM04/QQBOX USB DVB-S BOXES\n\nDM04/QQBOX DVB-S USB BOX with LME2510C+SHARP:BS2F7HZ7395 or LME2510+LGTDQT-P001F tuner.\n\n[mchehab@redhat.com: Fix merge conflicts/compilation and CodingStyle issues]\nSigned-off-by: Malcolm Priestley \u003ctvboxspy@gmail.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "692d5522646fdf432329efbe5092dc9c5ca83e85", "tree": "b68da8aa39f3acd1098ed6c7129e6ccebcf44cb0", "parents": [ "c4ce6d14b92aa1772c9d84d068d1b45114fe73cc" ], "author": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Fri Jul 30 17:24:55 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:04:52 2010 -0200" }, "message": "V4L/DVB: v4l: Add a v4l2_subdev host private data field\n\nThe existing priv field stores subdev private data owned by the subdev\ndriver. Host (bridge) drivers might need to store per-subdev\nhost-specific data, such as a pointer to platform data.\n\nAdd a v4l2_subdev host_priv field to store host-specific data, and\nrename the existing priv field to dev_priv.\n\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nAcked-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "6c2d4dd139de417d18151b98c157aa35387038a3", "tree": "747e5076eced841d914895e19e66c0743cf10484", "parents": [ "7a569f524dd36806b995c844f29e28ff40c444b2" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Thu Aug 12 17:16:00 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:04:48 2010 -0200" }, "message": "V4L/DVB: V4L2: avoid name conflicts in macros\n\n\"sd\" and \"err\" are too common names to be used in macros for local variables.\nPrefix them with an underscore to avoid name clashing.\n\n[mchehab@redhat.com: whitespace cleanups]\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nReviewed-by: Andy Walls \u003cawalls@md.metrocast.net\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "7a569f524dd36806b995c844f29e28ff40c444b2", "tree": "f771e5bd298089fe007a74d654c756fda4c39f3e", "parents": [ "516c714c6c823e412dc485ca9c5307348cddd097" ], "author": { "name": "Jarod Wilson", "email": "jarod@redhat.com", "time": "Sat Aug 07 13:31:40 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:04:47 2010 -0200" }, "message": "V4L/DVB: IR/streamzap: functional in-kernel decoding\n\nThis patch makes in-kernel decoding with the stock Streamzap PC Remote\nwork out of the box. There are quite a few things going on in this\npatch, all related to getting this working:\n\n1) I had to enable reporting of a long space at the end of each signal,\n or I had weird buffering and keybounce issues.\n\n2) The keymap has been reworked slightly to match actual decoded values,\n the first edition was missing the pre-data bits present in the lirc\n config file for this remote.\n\n3) There\u0027s a whole new decoder included, specifically for the\n not-quite-RC5 15-bit protocol variant used by the Streamzap PC\n Remote. The decoder, while usable with other recievers (tested with\n an mceusb receiver), will only be loaded by the streamzap driver, as\n its likely not of use in almost all other situations. This can be\n revisited if/when all keytable loading (and disabling of unneeded\n protocol decoder engines) is moved to userspace, but for now, I think\n this makes the most sense.\n\nNote that I did try to enable handling the streamzap RC5-ish protocol in\nthe current RC5 decoder, but there\u0027s no particularly easy way to tell if\nits 14-bit RC5 or 15-bit Streamzap until we see bit 14, and even then,\nin testing an attempted decoder merge, only 2/3 of the keys were\nproperly recognized as being the 15-bit variant and decoded correctly,\nthe rest were close enough to compliant with 14-bit that they were\ndecoded as such (but they have overlap with one another, and thus we\ncan\u0027t just shrug and use the 14-bit decoded values).\n\nAlso of note in this patch is the removal of the streamzap driver\u0027s\ninternal delay buffer. Per discussion w/Christoph, it shouldn\u0027t be\nneeded by lirc any longer anyway, and it doesn\u0027t seem to make any\ndifference to the in-kernel decoder engine. That being the case, I\u0027m\nyanking it all out, as it greatly simplifies the driver code.\n\nSigned-off-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "fba32e0c70364f46a3d9ff36af5c85f1bd32ac7a", "tree": "e41722517e7ddcaae10816653e12b66b99743873", "parents": [ "aabb541118af0a2fee3a878f61292384bf80fb2f" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Sun May 09 07:42:03 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:04:42 2010 -0200" }, "message": "V4L/DVB: v4l2-subdev: remove obsolete enum/try/s/g_fmt\n\nThese have now all been replaced by enum/try/s/g_mbus_fmt.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "d7709ffff4117f7c7700755accfe9d5e429efc53", "tree": "2ffbbf11e32621823aeb1278333b55fc573166dc", "parents": [ "c5e76a6d2aecca761f57b7a40df79812fad7fb98" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Fri Aug 06 16:25:04 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:04:41 2010 -0200" }, "message": "V4L/DVB: v4l: add RGB444 mediabus formats\n\nThese are needed for the ov7670 driver.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "0edc4afbcf59e4156e06f9e91f72c8fc47ceb856", "tree": "6000652233c34e6f48ab6f9cd47bbb856b6ce4b4", "parents": [ "f6f94e2ab1b33f0082ac22d71f66385a60d8157f" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Sat Aug 07 06:27:16 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Oct 21 01:04:36 2010 -0200" }, "message": "V4L/DVB: v4l: add new YUV mediabus formats\n\nNeeded for tvp7002 and tvp514x drivers.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "2fc11536cf5c0b8eb4eb7e01a2a672a189e9280f", "tree": "f36f0250089dbed08779550f02f78613364bc787", "parents": [ "c10469c637602c2385e2993d8c730cc44fd47d23" ], "author": { "name": "Hans Verkuil", "email": "hans.verkuil@tandberg.com", "time": "Tue Sep 07 06:10:45 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Mon Sep 27 22:22:01 2010 -0300" }, "message": "V4L/DVB: videobuf-dma-sg: set correct size in last sg element\n\nThis fixes a nasty memory corruption bug when using userptr I/O.\nThe function videobuf_pages_to_sg() sets up the scatter-gather list for the\nDMA transfer to the userspace pages. The first transfer is setup correctly\n(the size is set to PAGE_SIZE - offset), but all other transfers have size\nPAGE_SIZE. This is wrong for the last transfer which may be less than PAGE_SIZE.\n\nMost, if not all, drivers will program the boards DMA engine correctly, i.e.\neven though the size in the last sg element is wrong, they will do their\nown size calculations and make sure the right amount is DMA-ed, and so seemingly\nprevent memory corruption.\n\nHowever, behind the scenes the dynamic DMA mapping support (in lib/swiotlb.c)\nmay create bounce buffers if the memory pages are not in DMA-able memory.\nThis happens for example on a 64-bit linux with a board that only supports\n32-bit DMA.\n\nThese bounce buffers DO use the information in the sg list to determine the\nsize. So while the DMA engine transfers the correct amount of data, when the\ndata is \u0027bounced\u0027 back too much is copied, causing buffer overwrites.\n\nThe fix is simple: calculate and set the correct size for the last sg list\nelement.\n\nSigned-off-by: Hans Verkuil \u003chans.verkuil@tandberg.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "9f470095068e415658ccc6977cf4b3f5be418526", "tree": "b562b84cf87d9f28cd658365bf98a8012238a8d3", "parents": [ "67127f3061cc486572a50990a1fd919ddde48c40" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu Sep 09 21:59:11 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu Sep 09 22:01:49 2010 -0700" }, "message": "Input: media/IR - switch to using new keycode interface\n\nSwitch the code to use new style of getkeycode and setkeycode\nmethods to allow retrieving and setting keycodes not only by\ntheir scancodes but also by index.\n\nAcked-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "f6e114eed0414fbba9eb73480cd8efdaba96aaa7", "tree": "fcb31574d26bfc20ea3ca46e25968f7f66867495", "parents": [ "e34e658b5a42fb1a12fda2112f0b556cf5d1f1c4" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Mon May 24 10:16:43 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Sun Aug 08 23:43:05 2010 -0300" }, "message": "V4L/DVB: cx2341x: convert to the control framework\n\nSince this module is also used by drivers that are not yet converted, the old\nand new code have to co-exist.\n\nThe source is split into three parts: a common part at the top, which is used\nby both old and new code, then the old code followed by the new control\nframework implementation. This new code is much more readable (and shorter!)\nthan the original code.\n\nOnce all bridge drivers that use this are converted the old code can be\ndeleted.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "72c851b00f6c86353c54fdd9f1ef88d82e8df6c5", "tree": "dc6a86897e06b9ad5b576ef5d75a3c5ddab9815b", "parents": [ "59b8311a9b4cdd3e11d1c7d434bb9abf1ae3bc5c" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Fri Aug 06 10:53:19 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Sun Aug 08 23:43:05 2010 -0300" }, "message": "V4L/DVB: cx25840/ivtv: replace ugly priv control with s_config\n\nThe cx25840 used a private control CX25840_CID_ENABLE_PVR150_WORKAROUND\nto be told whether to enable a workaround for certain pvr150 cards.\n\nThis is really config data that it needs to get at load time.\n\nImplemented this in cx25840 and ivtv.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "0996517cf8eaded69b8502c8f5abeb8cec62b6d4", "tree": "672be97933e8028200eb6718bb49f0ef5c1f4013", "parents": [ "03e30ca5f08e0f9c629204e537ff96b789e6e703" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Sun Aug 01 14:32:42 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Sun Aug 08 23:43:03 2010 -0300" }, "message": "V4L/DVB: v4l2: Add new control handling framework\n\nAdd a new framework to handle controls which makes life for driver\ndevelopers much easier.\n\nNote that this patch moves some of the control support that used to be in\nv4l2-common.c to v4l2-ctrls.c. The tables were copied unchanged. The body\nof v4l2_ctrl_query_fill() was copied to a new v4l2_ctrl_fill() function\nin v4l2-ctrls.c. This new function doesn\u0027t use the v4l2_queryctrl\nstruct anymore, which makes it more general.\n\nThe remainder of v4l2-ctrls.c is all new. Highlights include:\n\n- No need to implement VIDIOC_QUERYCTRL, QUERYMENU, S_CTRL, G_CTRL,\n S_EXT_CTRLS, G_EXT_CTRLS or TRY_EXT_CTRLS in either bridge drivers\n or subdevs. New wrapper functions are provided that can just be plugged in.\n Once everything has been converted these wrapper functions can be removed as well.\n\n- When subdevices are added their controls can be automatically merged\n with the bridge driver\u0027s controls.\n\n- Most drivers just need to implement s_ctrl to set the controls.\n The framework handles the locking and tries to be as \u0027atomic\u0027 as possible.\n\n- Ready for the subdev device nodes: the same mechanism applies to subdevs\n and their device nodes as well. Sub-device drivers can make controls\n local, preventing them from being merged with bridge drivers.\n\n- Takes care of backwards compatibility handling of VIDIOC_S_CTRL and\n VIDIOC_G_CTRL. Handling of V4L2_CID_PRIVATE_BASE is fully transparent.\n CTRL_CLASS controls are automatically added.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nReviewed-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "e589333f346b58f8da5bb8152e1219c52d375ccc", "tree": "4ff05f4f9c5a06c532084ed46b3612ebeec1e21c", "parents": [ "4a702ebf61120906696f8366dd2be0653b1643e3" ], "author": { "name": "Maxim Levitsky", "email": "maximlevitsky@gmail.com", "time": "Sat Jul 31 11:59:23 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Sun Aug 08 23:43:00 2010 -0300" }, "message": "V4L/DVB: IR: extend interfaces to support more device settings\n\nLIRC: add new IOCTL that enables learning mode (wide band receiver)\nStill missing features: carrier report \u0026 timeout reports.\nWill need to pack these into ir_raw_event\n\nSigned-off-by: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "4a702ebf61120906696f8366dd2be0653b1643e3", "tree": "d83d2662edcf538ebcb6bac103bdcadbed430426", "parents": [ "b378f43fe9466e7712a8b16be64795ffca3a937e" ], "author": { "name": "Maxim Levitsky", "email": "maximlevitsky@gmail.com", "time": "Sat Jul 31 11:59:22 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Sun Aug 08 23:43:00 2010 -0300" }, "message": "V4L/DVB: IR: add helper function for hardware with small o/b buffer\n\nSome ir input devices have small buffer, and interrupt the host\neach time it is full (or half full)\n\nAdd a helper that automaticly handles timeouts, and also\nautomaticly merges samples of same time (space-space)\nSuch samples might be placed by hardware because size of\nsample in the buffer is small (a byte for example).\n\nAlso remove constness from ir_dev_props, because it now contains timeout\nsettings that driver might want to change\n\nSigned-off-by: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nAcked-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "b378f43fe9466e7712a8b16be64795ffca3a937e", "tree": "72b73594094549d049f0dcdd653135f42e3f2b29", "parents": [ "86ff071cad3e7e4c7469b3941bfced6fe9b04b5f" ], "author": { "name": "Maxim Levitsky", "email": "maximlevitsky@gmail.com", "time": "Sat Jul 31 11:59:21 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Sun Aug 08 23:43:00 2010 -0300" }, "message": "V4L/DVB: IR: Allow not to compile keymaps in\n\nCurrently, ir device registration fails if keymap requested by driver is not found.\nFix that by always compiling in the empty keymap, and using it as a failback.\n\nSigned-off-by: Maxim Levitsky \u003cmaximlevitsky@gmail.com\u003e\nAcked-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "8e9e60640067858e8036d4d43bbf725c60613359", "tree": "612a944b44ec346eb3bda77417d4eb036891676e", "parents": [ "7c294402d58e22bb760c0e1a825eea5d582a8f2d" ], "author": { "name": "Jarod Wilson", "email": "jarod@redhat.com", "time": "Tue Aug 03 01:07:04 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Sun Aug 08 23:42:58 2010 -0300" }, "message": "V4L/DVB: staging/lirc: port lirc_streamzap to ir-core\n\nThis ports lirc_streamzap.c over to ir-core in-place, to be followed by\na patch moving the driver over to drivers/media/IR/streamzap.c and\nenabling the proper Kconfig bits.\n\nPresently, the in-kernel keymap doesn\u0027t work, as the stock Streamzap\nremote uses an RC-5-like, but not-quite-RC-5 protocol, which the\nin-kernel RC-5 decoder doesn\u0027t cope with. The remote can be used right\nnow with the lirc bridge driver though, and other remotes (at least an\nRC-6(A) MCE remote) work perfectly with the driver.\n\nI\u0027ll take a look at making the existing RC-5 decoder cope with this odd\nduck, possibly implement another standalone decoder engine, or just\nthrow up my hands and say \"meh, use lirc\"... But the driver itself\nshould be perfectly sound.\n\nRemaining items on the streamzap TODO list:\n- add LIRC_SET_REC_TIMEOUT-alike support\n- add LIRC_GET_M{AX,IN}_TIMEOUT-alike support\n- add LIRC_GET_REC_RESOLUTION-alike support\n\nAll of the above should be trivial to add. There are patches pending to\nadd this support to ir-core from Maxim Levitsky, and I\u0027ll take care of\nthese once his patches get integrated. None of them are currently\nessential though.\n\nSigned-off-by: Jarod Wilson \u003cjarod@redhat.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "d69e85b644dbc8c68dec3b4149941989d4bcc66f", "tree": "b5351d1c1dd1b30f5cbe270e4e48f4d33d16db2e", "parents": [ "c02e0d12a9a0a913dee5efd695603b73ee4b729a" ], "author": { "name": "Andy Walls", "email": "awalls@md.metrocast.net", "time": "Sun Aug 01 02:36:20 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Sun Aug 08 23:42:57 2010 -0300" }, "message": "V4L/DVB: v4l2_subdev: Get rid of now unused IR pulse width defines\n\nSigned-off-by: Andy Walls \u003cawalls@md.metrocast.net\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "260e689ba237fb513b49e98841d98e93ea639c75", "tree": "b671e9e72757568222fb6c808e2ff7050b8468c8", "parents": [ "81f287da73377eb408de6879aa6c54c6d57dc1db" ], "author": { "name": "Andy Walls", "email": "awalls@md.metrocast.net", "time": "Sun Jul 18 20:54:52 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Sun Aug 08 23:42:55 2010 -0300" }, "message": "V4L/DVB: v4l2_subdev: Move interrupt_service_routine ptr to v4l2_subdev_core_ops\n\nThe CX2584x and related cores are multifunction subdevices with a number\nof internal blocks that act as interrupt sources. Move the v4L2_subdev\ninterrupt_service_routine callback from v4l_subdev_ir_ops to\nv4l2_subdev_core_ops, as the video and audio blocks of a CX2584x and\nrelated cores can generate interrupts along with the IR block. This\nchange also makes sense for other subdev\u0027s that generate interrupts and\ndo not have an IR block.\n\nSigned-off-by: Andy Walls \u003cawalls@md.metrocast.net\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "5a28d9a320c865007da830c065bcaecfe91b3932", "tree": "60ca62e075c8b917165582707f1b0748512a471e", "parents": [ "d06d5777b211112e8355e2f5a700c6a9babfdd6f" ], "author": { "name": "Andy Walls", "email": "awalls@md.metrocast.net", "time": "Sun Jul 18 19:57:25 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Sun Aug 08 23:42:54 2010 -0300" }, "message": "V4L/DVB: v4l2_subdev, cx23885: Differentiate IR carrier sense and I/O pin inversion\n\nThere is a distinction on IR Tx for the CX2388[578] chips of carrier\nsense inversion (space is a carrier burst and mark is no burst) and I/O\npin level inversion (0 is high output level, 1 is low output level).\nAllow the caller to set these parameters distinctly as v4l2_subdevice\nIR parameters. This permits the IR device to be configured and enabled\nwithout the IR Tx LED being on during idle/space time due to an external\nhardware level inversion\n\nSigned-off-by: Andy Walls \u003cawalls@md.metrocast.net\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" } ], "next": "d06d5777b211112e8355e2f5a700c6a9babfdd6f" }