Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
	arch/arm/mach-omap2/board-rx51-peripherals.c
	drivers/staging/tm6000/tm6000-alsa.c

diff --cc Documentation/DocBook/media/v4l/io.xml
Simple merge

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index cc503aa89c5e3685b6cc5901a2329a67c6926d99,17e5685ae0cd1bd6720bd2307b058f589a4e92d6..5a886cd2c598c408f3e007e01a5f5e2b0ae9ca94
--- 1/arch/arm/mach-omap2/board-rx51-peripherals.c
--- 2/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -414,17 -358,17 +414,21 @@@ static struct omap2_hsmmc_info mmc[] __
        {}      /* Terminator */
  };
  
 -static struct regulator_consumer_supply rx51_vmmc1_supply =
 -      REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0");
 +static struct regulator_consumer_supply rx51_vmmc1_supply[] = {
 +      REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),
 +};
  
 -static struct regulator_consumer_supply rx51_vaux2_supply =
 -      REGULATOR_SUPPLY("vdds_csib", "omap3isp");
++static struct regulator_consumer_supply rx51_vaux2_supply[] = {
++      REGULATOR_SUPPLY("vdds_csib", "omap3isp"),
++};
+ 
 -static struct regulator_consumer_supply rx51_vaux3_supply =
 -      REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1");
 +static struct regulator_consumer_supply rx51_vaux3_supply[] = {
 +      REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"),
 +};
  
 -static struct regulator_consumer_supply rx51_vsim_supply =
 -      REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.1");
 +static struct regulator_consumer_supply rx51_vsim_supply[] = {
 +      REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.1"),
 +};
  
  static struct regulator_consumer_supply rx51_vmmc2_supplies[] = {
        /* tlv320aic3x analog supplies */
@@@ -479,6 -427,8 +483,8 @@@ static struct regulator_init_data rx51_
                .valid_ops_mask         = REGULATOR_CHANGE_MODE
                                        | REGULATOR_CHANGE_STATUS,
        },
 -      .num_consumer_supplies  = 1,
 -      .consumer_supplies      = &rx51_vaux2_supply,
++      .num_consumer_supplies  = ARRAY_SIZE(rx51_vaux2_supply),
++      .consumer_supplies      = rx51_vaux2_supply,
  };
  
  /* VAUX3 - adds more power to VIO_18 rail */

diff --cc arch/arm/mach-shmobile/board-ap4evb.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge

diff --cc arch/sh/boards/mach-ap325rxa/setup.c
Simple merge

diff --cc drivers/media/rc/ite-cir.c
Simple merge

diff --cc drivers/media/video/hdpvr/hdpvr-core.c
Simple merge

diff --cc drivers/media/video/omap24xxcam.c
Simple merge

diff --cc drivers/media/video/uvc/uvc_ctrl.c
Simple merge

diff --cc drivers/media/video/uvc/uvc_v4l2.c
Simple merge

diff --cc drivers/media/video/videobuf2-memops.c
Simple merge

diff --cc drivers/staging/cxd2099/cxd2099.c
Simple merge

diff --cc drivers/staging/tm6000/tm6000-alsa.c
index ddfd7c33361ba31ba64fb1a4ef3a4a79b5b1c260,018ff73ab71d70b93908c9d095f1c01707a111d3..bd5fa89af07c32814ea55f28c0075dad7747cdad
--- 1/drivers/staging/tm6000/tm6000-alsa.c
--- 2/drivers/staging/tm6000/tm6000-alsa.c
+++ b/drivers/staging/tm6000/tm6000-alsa.c
@@@ -254,9 -254,7 +254,7 @@@ static int tm6000_fillbuf(struct tm6000
                memcpy(runtime->dma_area + buf_pos * stride, buf,
                        length * stride);
  
- #ifndef NO_PCM_LOCK
 -       snd_pcm_stream_lock(substream);
 +      snd_pcm_stream_lock(substream);
- #endif
  
        chip->buf_pos += length;
        if (chip->buf_pos >= runtime->buffer_size)
@@@ -268,9 -266,7 +266,7 @@@
                period_elapsed = 1;
        }
  
- #ifndef NO_PCM_LOCK
 -       snd_pcm_stream_unlock(substream);
 +      snd_pcm_stream_unlock(substream);
- #endif
  
        if (period_elapsed)
                snd_pcm_period_elapsed(substream);

diff --cc kernel/compat.c
Simple merge