Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	sound/soc/codecs/wm8994.c

diff --cc drivers/gpu/drm/i915/i915_gem_tiling.c
Simple merge

diff --cc sound/soc/codecs/wm8994.c
index 3bcf292,d0c545b..6fc4b0f
--- 1/sound/soc/codecs/wm8994.c
--- 2/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@@ -1134,7 -975,13 +1006,17 @@@ static int adc_mux_ev(struct snd_soc_da
        return 0;
  }
  
++<<<<<<< HEAD
 +>>>>>>> d10902812c9cd5583130a4ebb9ad19c60b68149d
++=======
+ static int micbias_ev(struct snd_soc_dapm_widget *w,
+                     struct snd_kcontrol *kcontrol, int event)
+ {
+       late_enable_ev(w, kcontrol, event);
+       return 0;
+ }
+ 
++>>>>>>> c7f46b7aa4ae5cbef32eb5e016512a14f936affa
  static int dac_ev(struct snd_soc_dapm_widget *w,
                  struct snd_kcontrol *kcontrol, int event)
  {
@@@ -1459,21 -1324,18 +1363,21 @@@ SND_SOC_DAPM_DAC("DAC1L", NULL, WM8994_
  SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 0, 0),
  };
  
 +<<<<<<< HEAD
 +=======
  static const struct snd_soc_dapm_widget wm8994_adc_revd_widgets[] = {
- SND_SOC_DAPM_MUX_E("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux,
-                  adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
- SND_SOC_DAPM_MUX_E("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux,
-                  adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
+ SND_SOC_DAPM_VIRT_MUX_E("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux,
+                       adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
+ SND_SOC_DAPM_VIRT_MUX_E("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux,
+                       adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
  };
  
  static const struct snd_soc_dapm_widget wm8994_adc_widgets[] = {
- SND_SOC_DAPM_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux),
- SND_SOC_DAPM_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux),
+ SND_SOC_DAPM_VIRT_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux),
+ SND_SOC_DAPM_VIRT_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux),
  };
  
 +>>>>>>> d10902812c9cd5583130a4ebb9ad19c60b68149d
  static const struct snd_soc_dapm_widget wm8994_dapm_widgets[] = {
  SND_SOC_DAPM_INPUT("DMIC1DAT"),
  SND_SOC_DAPM_INPUT("DMIC2DAT"),
@@@ -1568,20 -1435,6 +1477,23 @@@ SND_SOC_DAPM_ADC("DMIC1R", NULL, WM8994
  SND_SOC_DAPM_ADC("ADCL", NULL, SND_SOC_NOPM, 1, 0),
  SND_SOC_DAPM_ADC("ADCR", NULL, SND_SOC_NOPM, 0, 0),
  
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +SND_SOC_DAPM_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux),
 +SND_SOC_DAPM_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux),
 +
 +=======
 +>>>>>>> d10902812c9cd5583130a4ebb9ad19c60b68149d
 +SND_SOC_DAPM_MUX("Left Headphone Mux", SND_SOC_NOPM, 0, 0, &hpl_mux),
 +SND_SOC_DAPM_MUX("Right Headphone Mux", SND_SOC_NOPM, 0, 0, &hpr_mux),
 +
 +SND_SOC_DAPM_MIXER("SPKL", WM8994_POWER_MANAGEMENT_3, 8, 0,
 +                 left_speaker_mixer, ARRAY_SIZE(left_speaker_mixer)),
 +SND_SOC_DAPM_MIXER("SPKR", WM8994_POWER_MANAGEMENT_3, 9, 0,
 +                 right_speaker_mixer, ARRAY_SIZE(right_speaker_mixer)),
 +
++=======
++>>>>>>> c7f46b7aa4ae5cbef32eb5e016512a14f936affa
  SND_SOC_DAPM_POST("Debug log", post_ev),
  };