Linus Torvalds 76d21c5635
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 ...
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits)
[media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
[media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly
[media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE
[media] v4l: soc-camera: Store negotiated buffer settings
[media] rc: interim support for 32-bit NEC-ish scancodes
[media] mceusb: topseed 0x0011 needs gen3 init for tx to work
[media] lirc_zilog: error out if buffer read bytes != chunk size
[media] lirc: silence some compile warnings
[media] hdpvr: use same polling interval as other OS
[media] ir-kbd-i2c: pass device code w/key in hauppauge case
[media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap
[media] remove the old RC_MAP_HAUPPAUGE_NEW RC map
[media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
[media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping
[media] rc-rc5-hauppauge-new: Add support for the old Black RC
[media] rc-rc5-hauppauge-new: Add the old control to the table
[media] rc-winfast: Fix the keycode tables
[media] a800: Fix a few wrong IR key assignments
[media] opera1: Use multimedia keys instead of an app-specific mapping
[media] dw2102: Use multimedia keys instead of an app-specific mapping
...
Fix up trivial conflicts (remove/modify and some real conflicts) in:
arch/arm/mach-omap2/devices.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/dabusb/dabusb.c
drivers/staging/dabusb/dabusb.h
drivers/staging/easycap/easycap_ioctl.c
drivers/staging/usbvideo/usbvideo.c
drivers/staging/usbvideo/vicam.c
2011-03-24 09:50:13 -07:00
2011-03-20 09:32:12 +00:00
2011-01-30 01:14:14 -08:00
2011-03-22 11:33:55 -07:00
2011-01-13 08:03:25 -08:00
2011-03-23 10:42:00 +01:00
2011-03-18 23:38:50 -07:00
2011-03-24 09:50:13 -07:00
2011-01-12 14:49:17 -08:00
2011-03-17 15:35:22 -04:00
2011-03-18 10:50:27 -07:00
2011-03-20 15:33:26 +01:00
2011-01-20 17:50:17 +01:00
2011-01-20 17:50:17 +01:00
2011-01-20 17:50:17 +01:00
2011-01-13 08:03:19 -08:00
2011-01-13 21:04:07 -05:00
2011-03-16 15:11:04 -07:00
2011-01-14 18:11:59 +03:00
2011-01-12 14:33:05 +00:00
2011-03-19 22:27:06 -07:00
2011-02-18 16:54:54 -05:00
2011-03-17 12:38:59 -04:00
2011-01-13 08:03:08 -08:00
2011-03-16 15:11:04 -07:00
2011-02-24 19:58:42 +01:00
2011-01-20 18:30:17 -08:00
2011-03-21 22:59:08 -04:00
2011-03-15 02:42:32 -04:00
2011-01-31 14:03:00 -08:00
2011-01-19 23:51:37 +01:00
2011-01-15 20:07:45 -05:00
2011-03-22 17:43:59 -07:00
2011-01-10 13:31:14 -08:00
2011-01-13 08:03:12 -08:00
2011-01-07 17:50:31 +11:00
2011-03-02 08:48:05 -05:00
2011-03-03 10:53:20 -05:00
2011-03-23 19:47:19 -07:00
2011-03-23 19:47:06 -07:00
2011-01-13 08:03:17 -08:00
2011-02-16 13:30:48 +01:00
2011-02-16 13:30:48 +01:00
2011-03-22 17:44:00 -07:00
2011-03-22 17:44:10 -07:00
2011-03-22 17:44:10 -07:00
2011-03-22 17:44:10 -07:00
2011-02-23 13:22:26 -08:00
2011-01-26 10:50:06 +10:00
2011-03-21 22:59:08 -04:00
2011-01-24 14:51:56 -08:00
2011-03-16 17:54:33 -04:00
2011-01-12 12:47:34 -05:00
2011-01-13 08:03:22 -08:00
2011-03-22 17:44:15 -07:00
2011-03-23 19:47:02 -07:00
2011-01-13 08:03:13 -08:00
2011-03-21 12:13:10 -04:00
2011-03-14 17:02:43 -07:00
2011-01-20 17:01:09 -08:00
2011-01-10 08:51:44 -08:00
2011-03-08 16:10:38 +01:00
2011-01-13 20:00:02 +00:00
2011-03-16 17:28:10 -07:00
2011-01-13 19:59:58 +00:00
2011-01-13 19:59:52 +00:00
2011-01-17 10:54:41 -08:00
2011-02-25 12:00:34 -08:00
2011-03-07 01:12:28 +05:30
2011-02-03 15:39:16 -08:00
2011-03-14 08:40:51 -07:00
2011-03-22 17:44:11 -07:00
2011-01-13 21:49:56 -08:00
2011-03-18 15:13:11 -07:00
2011-03-15 02:21:37 -04:00
2011-03-23 19:46:17 -07:00
2011-01-12 20:16:43 -05:00
2011-03-17 09:19:20 +08:00
2011-03-14 19:12:20 -04:00
2011-01-09 15:42:55 -08:00
2011-03-15 02:21:45 -04:00
2011-03-21 10:05:22 -07:00
2011-01-10 08:51:44 -08:00
2011-02-03 15:39:17 -08:00
2011-02-16 17:48:59 +01:00
2011-01-07 17:50:27 +11:00
2011-03-23 19:47:13 -07:00
2011-01-07 17:50:23 +11:00
2011-01-07 17:50:23 +11:00
2011-03-10 10:31:48 -05:00
2011-02-11 16:23:33 -05:00
2011-01-07 17:50:29 +11:00
2011-01-13 14:47:54 +01:00
2011-03-22 17:44:05 -07:00
2011-01-10 22:11:23 +01:00
2011-01-14 08:06:39 -08:00
2011-03-05 10:56:00 +01:00
2011-02-03 16:37:28 +01:00
2011-03-17 14:31:46 +01:00
2011-02-11 15:05:49 +01:00
2011-03-10 19:15:58 +01:00
2011-02-15 15:21:11 -08:00
2011-02-17 09:52:03 -08:00
2011-02-23 00:53:26 +00:00
2011-03-20 14:50:53 +01:00
2011-03-12 15:08:54 -08:00
2011-03-09 16:10:56 -05:00
2011-01-11 23:55:51 +01:00
2011-01-06 11:10:05 -08:00
2011-01-19 23:31:09 -08:00
2011-03-18 15:14:45 -07:00
2011-02-27 16:11:51 -08:00
2011-03-10 16:37:26 -08:00
2011-02-10 07:51:44 -05:00
2011-02-18 12:42:28 -08:00
2011-01-06 10:23:33 -08:00
2011-01-31 21:17:41 -08:00
2011-01-31 21:16:59 -08:00
2011-03-15 19:23:40 -07:00
2011-03-23 19:47:08 -07:00
2011-03-12 11:12:58 +01:00
2011-03-11 14:15:35 +01:00
2011-01-10 12:29:43 -05:00
2011-01-26 12:33:20 +01:00
2011-03-22 16:17:32 -07:00
2011-03-22 04:53:54 -03:00
2011-02-17 11:12:40 -08:00
2011-01-13 17:32:31 -08:00
2011-03-22 17:44:14 -07:00
2011-03-08 11:17:18 +11:00
2011-03-08 11:17:18 +11:00
2011-03-08 11:17:22 +11:00
2011-01-13 17:32:47 -08:00
2011-02-13 16:54:24 -08:00
2011-01-24 14:45:11 +10:30
2011-01-13 08:03:07 -08:00
2011-02-18 08:02:10 -08:00
2011-01-07 17:02:58 -08:00
2011-01-07 08:43:37 +01:00
2011-03-22 17:44:01 -07:00
2011-03-17 13:08:30 -03:00
2011-01-12 11:23:08 +02:00
2011-01-12 11:23:12 +02:00
2011-03-22 17:43:59 -07:00
2011-01-13 08:03:06 -08:00
2011-01-13 08:03:05 -08:00
2011-03-22 17:43:59 -07:00
2011-03-14 02:52:41 -04:00
2011-01-14 13:12:45 +00:00
2011-02-18 11:32:28 -08:00
2011-01-21 13:38:57 -08:00
2011-03-18 22:33:38 -07:00
2011-01-10 19:04:08 +01:00
2011-03-22 04:53:56 -03:00
2011-03-23 19:46:25 -07:00
2011-01-15 13:28:17 +02:00
2011-02-03 16:08:57 -08:00
2011-02-14 17:38:30 -08:00
2011-01-13 17:32:34 -08:00
2011-01-13 17:32:46 -08:00
2011-03-22 17:44:03 -07:00
2011-03-23 20:51:42 -07:00
2011-01-13 17:32:46 -08:00
2011-02-15 10:24:31 +01:00
2011-02-21 15:21:53 -08:00
2011-01-24 14:32:52 +10:30
2011-01-16 13:47:07 -05:00
2011-02-03 18:05:29 -08:00
2011-01-30 01:14:38 -08:00
2011-03-02 13:43:15 -08:00
2011-03-18 09:04:20 -04:00
2011-01-12 20:03:43 -05:00
2011-01-12 20:03:43 -05:00
2011-02-22 10:19:31 -08:00
2011-03-16 12:53:54 -07:00
2011-01-18 16:08:30 +01:00
2011-03-03 13:32:07 -08:00
2011-01-14 13:17:26 -08:00
2011-03-11 15:39:27 -05:00
2011-03-11 15:38:40 -05:00
2011-03-11 15:39:26 -05:00
2011-03-11 15:38:44 -05:00
2011-03-11 15:38:44 -05:00
2011-03-14 18:25:53 -04:00
2011-01-25 15:24:47 -05:00
2011-03-10 17:29:40 +09:00
2011-03-01 13:48:21 -05:00
2011-02-03 16:08:57 -08:00
2011-02-28 01:36:38 -07:00
2011-01-15 22:01:58 -07:00
2011-02-04 11:46:50 -07:00
2011-03-23 14:55:56 -06:00
2011-03-16 17:28:10 -07:00
2011-03-22 04:53:46 -03:00
2011-02-15 11:10:20 +01:00
2011-03-23 19:46:28 -07:00
2011-03-22 17:44:03 -07:00
2011-03-22 17:44:02 -07:00
2011-03-14 02:58:03 -04:00
2011-01-16 13:47:07 -05:00
2011-03-23 10:42:08 +01:00
2011-01-16 11:56:26 -08:00
2011-03-18 10:56:44 -07:00
2011-02-28 11:20:03 +01:00
2011-03-16 14:04:14 +01:00
2011-03-09 11:59:33 -08:00
2011-03-23 19:46:57 -07:00
2011-01-10 07:38:54 -08:00
2011-02-24 22:11:56 -08:00
2011-02-18 08:15:51 -08:00
2011-03-11 15:13:26 -05:00
2011-03-15 00:43:14 +01:00
2011-03-15 00:43:14 +01:00
2011-03-15 00:43:16 +01:00
2011-01-25 15:24:47 -05:00
2011-02-02 15:28:20 +01:00
2011-02-02 15:28:20 +01:00
2011-01-13 08:03:21 -08:00
2011-01-13 08:03:21 -08:00
2011-01-13 08:03:10 -08:00
2011-03-23 19:46:37 -07:00
2011-03-04 09:23:30 -08:00
2011-03-22 17:44:00 -07:00
2011-01-12 19:14:55 +01:00
2011-01-12 19:14:55 +01:00
2011-01-13 17:32:48 -08:00
2011-01-14 02:36:43 +00:00
2011-03-23 19:46:18 -07:00
2011-02-01 11:12:29 -05:00
2011-03-23 19:46:23 -07:00
2011-03-09 13:52:27 -05:00
2011-03-23 19:46:41 -07:00
2011-01-13 08:03:18 -08:00
2011-02-25 15:07:37 -08:00
2011-03-23 19:46:43 -07:00
2011-03-22 17:44:03 -07:00
2011-01-13 08:03:23 -08:00
2011-03-09 11:23:37 -08:00
2011-01-27 12:30:38 +01:00
2011-01-27 12:30:39 +01:00
2011-01-27 12:30:40 +01:00
2011-03-23 19:46:30 -07:00
2011-03-23 19:47:02 -07:00
2011-01-07 17:50:27 +11:00
2011-01-13 08:03:19 -08:00
2011-01-19 15:37:31 +09:00
2011-03-22 17:44:15 -07:00
2011-03-16 12:53:54 -07:00
2011-01-23 21:00:05 +02:00
2011-03-22 20:48:04 +02:00
2011-03-22 17:16:34 +09:00
2011-03-23 07:48:42 -07:00
2011-01-13 10:25:58 -08:00
2011-03-09 14:08:09 -08:00
2011-01-10 12:00:22 -05:00
2011-01-27 12:30:38 +01:00
2011-03-15 00:43:16 +01:00
2011-03-22 15:47:22 +09:00
2011-03-22 17:44:04 -07:00
2011-03-21 00:40:29 -04:00
2011-03-15 00:43:46 +01:00
2011-03-09 16:43:24 -08:00
2011-01-24 09:33:36 -08:00
2011-02-28 18:00:31 -08:00
2011-02-02 15:28:13 +01:00
2011-02-04 12:41:21 -08:00
2011-02-21 12:53:08 -08:00
2011-02-02 15:28:18 +01:00
2011-03-13 16:35:18 -04:00
2011-02-23 18:05:11 -05:00
2011-01-13 08:03:08 -08:00
2011-02-03 09:28:46 -05:00
2011-02-17 11:59:56 -08:00
2011-01-13 08:03:20 -08:00
2011-03-22 16:17:32 -07:00
2011-03-22 17:44:09 -07:00
2011-02-04 11:48:55 -08:00
2011-01-13 08:03:18 -08:00
2011-03-23 19:47:03 -07:00
2011-03-22 04:53:37 -03:00
2011-03-22 04:53:33 -03:00
2011-01-06 13:05:04 +10:00
2011-03-22 04:54:51 -03:00
2011-01-24 14:45:11 +10:30
2011-02-09 08:19:55 +10:30
2011-01-13 17:32:34 -08:00
2011-03-22 17:44:05 -07:00
2011-02-17 11:13:19 -08:00
2011-02-21 10:07:23 +01:00
2011-01-17 08:05:27 -08:00
2011-03-13 20:22:28 -07:00
2011-01-13 08:03:24 -08:00
2011-03-22 17:44:17 -07:00
76d21c5635