Linus Torvalds
664a41b8a9
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: (430 commits)
[media] ir-mce_kbd-decoder: include module.h for its facilities
[media] ov5642: include module.h for its facilities
[media] em28xx: Fix DVB-C maxsize for em2884
[media] tda18271c2dd: Fix saw filter configuration for DVB-C @6MHz
[media] v4l: mt9v032: Fix Bayer pattern
[media] V4L: mt9m111: rewrite set_pixfmt
[media] V4L: mt9m111: fix missing return value check mt9m111_reg_clear
[media] V4L: initial driver for ov5642 CMOS sensor
[media] V4L: sh_mobile_ceu_camera: fix Oops when USERPTR mapping fails
[media] V4L: soc-camera: remove soc-camera bus and devices on it
[media] V4L: soc-camera: un-export the soc-camera bus
[media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier
[media] V4L: add media bus configuration subdev operations
[media] V4L: soc-camera: group struct field initialisations together
[media] V4L: soc-camera: remove now unused soc-camera specific PM hooks
[media] V4L: pxa-camera: switch to using standard PM hooks
[media] NetUP Dual DVB-T/C CI RF: force card hardware revision by module param
[media] Don't OOPS if videobuf_dvb_get_frontend return NULL
[media] NetUP Dual DVB-T/C CI RF: load firmware according card revision
[media] omap3isp: Support configurable HS/VS polarities
...
Fix up conflicts:
- arch/arm/mach-omap2/board-rx51-peripherals.c:
cleanup regulator supply definitions in mach-omap2
vs
OMAP3: RX-51: define vdds_csib regulator supply
- drivers/staging/tm6000/tm6000-alsa.c (trivial)
2011-07-30 00:08:53 -07:00
2011-07-26 17:12:10 -07:00
2011-06-20 01:25:39 -07:00
2011-07-04 18:43:43 +03:00
2011-06-20 01:25:39 -07:00
2011-07-26 17:42:18 -07:00
2011-06-20 01:25:39 -07:00
2011-06-20 01:25:39 -07:00
2011-06-20 01:25:39 -07:00
2011-07-11 23:53:01 +02:00
2011-06-29 03:35:18 -07:00
2011-07-04 18:43:43 +03:00
2011-06-29 01:11:37 -07:00
2011-06-30 12:58:01 +00:00
2011-06-20 01:25:39 -07:00
2011-07-04 18:43:43 +03:00
2011-07-04 18:43:38 +03:00
2011-06-20 01:25:39 -07:00
2011-07-10 11:48:26 -07:00
2011-07-04 18:43:43 +03:00
2011-06-29 03:35:18 -07:00
2011-07-04 18:43:43 +03:00
2011-07-04 18:43:43 +03:00
2011-07-04 18:43:43 +03:00
2011-07-04 18:43:33 +03:00
2011-07-11 23:53:01 +02:00
2011-07-04 18:43:38 +03:00
2011-07-30 00:08:53 -07:00
2011-05-26 12:11:54 -07:00
2011-06-20 01:25:39 -07:00
2011-06-20 01:25:39 -07:00
2011-07-04 04:11:08 -07:00
2011-05-31 06:17:02 -07:00
2011-07-04 18:44:02 +03:00
2011-06-20 01:25:39 -07:00
2011-05-13 07:08:18 -07:00
Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024
2011-03-10 22:41:28 -07:00
2011-07-10 05:54:12 -06:00
2011-07-26 17:42:18 -07:00
2011-07-09 19:14:46 -06:00
2011-07-10 05:54:12 -06:00
2011-07-10 05:54:12 -06:00
2011-07-26 17:42:18 -07:00
2011-07-10 05:57:06 -06:00
2011-07-10 05:56:55 -06:00
2011-07-10 05:56:55 -06:00
2011-07-10 05:56:55 -06:00
2011-07-10 05:56:55 -06:00
2011-07-10 05:56:29 -06:00
2011-07-09 19:15:05 -06:00
2011-07-09 19:15:05 -06:00
2011-04-20 12:43:56 -06:00
2011-07-10 05:56:30 -06:00
2011-07-26 17:09:31 -07:00
2011-07-10 05:56:32 -06:00
2011-07-10 05:56:32 -06:00
2011-07-04 18:43:27 +03:00
2011-07-04 18:43:27 +03:00
2011-06-24 09:54:31 +01:00
2011-06-24 09:54:31 +01:00
2011-05-20 17:15:54 +02:00
2011-07-05 03:38:24 -07:00
2011-03-22 04:53:42 -03:00
2011-05-11 14:20:11 +03:00
2011-03-31 11:26:23 -03:00
2011-07-22 16:01:57 -07:00
2011-06-29 01:11:37 -07:00
2011-05-12 02:52:06 -07:00
2011-05-12 02:52:06 -07:00
2011-03-29 14:47:57 +02:00
2011-07-04 04:11:08 -07:00
2011-06-01 02:25:04 -07:00
2011-07-10 05:27:16 -06:00
2011-07-08 02:11:45 -07:00
2011-06-16 05:42:09 -07:00
2011-07-04 15:07:45 +03:00
2011-06-16 05:42:09 -07:00
2011-07-05 03:38:23 -07:00
2011-07-09 19:14:07 -06:00
2011-03-31 11:26:23 -03:00
2011-06-01 02:25:04 -07:00
2011-03-31 11:26:23 -03:00
2011-06-01 02:25:04 -07:00
2011-06-01 02:25:04 -07:00
2011-06-16 05:42:09 -07:00
2011-07-09 19:14:06 -06:00
2011-07-09 19:14:08 -06:00
2011-07-09 19:14:06 -06:00
2011-07-09 19:14:08 -06:00
2011-07-10 05:27:16 -06:00
2011-07-10 05:56:32 -06:00
2011-07-10 05:27:16 -06:00
2011-07-10 05:27:16 -06:00
2011-07-09 19:14:07 -06:00
2011-07-09 19:14:08 -06:00
2011-07-10 05:57:07 -06:00
2011-05-03 02:38:01 -07:00
2011-05-17 03:44:50 -07:00
2011-03-10 22:17:45 -07:00
2011-06-01 02:25:04 -07:00
2011-03-31 11:26:23 -03:00
2011-07-04 15:08:06 +03:00
2011-07-07 14:45:07 +01:00
2011-03-11 09:39:58 -08:00
2011-03-11 09:39:58 -08:00
2011-06-20 14:12:32 -07:00
2011-07-25 12:38:42 -07:00
2011-05-03 02:38:03 -07:00
2011-06-29 04:45:16 -07:00
2011-07-10 05:56:54 -06:00
2011-07-25 12:38:42 -07:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_add_can_lose_context_fns_2.6.39', 'remotes/origin/omap_device_a_2.6.39', 'remotes/origin/mmc_a_2.6.39', 'remotes/origin/hwmod_b_2.6.39', 'remotes/origin/dmtimer_a_2.6.39', 'remotes/origin/pwrdm_clkdm_a_2.6.39', 'remotes/origin/clkdm_statdep_omap4_2.6.39', 'remotes/origin/clk_a_2.6.39', 'remotes/origin/clk_autoidle_a_2.6.39', 'remotes/origin/clk_autoidle_b_2.6.39', 'remotes/origin/clk_b_2.6.39', 'remotes/origin/clk_clkdm_a_2.6.39', 'remotes/origin/misc_a_2.6.39', 'remotes/origin/for_2.6.39/omap3_hwmod_data' and 'remotes/origin/wdtimer_a_2.6.39' into tmp-integration-2.6.39-20110310-024
2011-03-10 22:41:28 -07:00
2011-03-31 11:26:23 -03:00
2011-07-10 05:44:23 -06:00
2011-07-09 19:15:06 -06:00
2011-07-10 05:56:31 -06:00
2011-07-10 05:56:31 -06:00
2011-07-10 05:56:31 -06:00
2011-07-08 02:18:24 -07:00
2011-07-10 05:56:31 -06:00
2011-07-10 05:56:31 -06:00
2011-07-12 22:48:42 +02:00
2011-06-30 08:47:35 +01:00
2011-06-20 14:12:31 -07:00
2011-03-17 19:28:15 -07:00
2011-06-27 12:14:02 -07:00
2011-07-04 18:44:02 +03:00
2011-07-04 18:43:43 +03:00
2011-07-01 14:31:14 -07:00
2011-05-12 02:52:06 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-05-17 03:44:50 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
2011-03-10 22:17:45 -07:00
664a41b8a9