Merge branch 'for-linus' into for-next

diff --cc sound/atmel/abdac.c
index b78a3bc6f35e2586245e4d051e87171b81fb4098,721d8fd45685f769cbc616a6ba0552b85cd5c841..3519518e25a09612c71f1888bc097e9f088ca6ee
--- 1/sound/atmel/abdac.c
--- 2/sound/atmel/abdac.c
+++ b/sound/atmel/abdac.c
@@@ -354,10 -354,11 +354,11 @@@ static int set_sample_rates(struct atme
        /* we start at 192 kHz and work our way down to 5112 Hz */
        while (new_rate >= RATE_MIN && index < (MAX_NUM_RATES + 1)) {
                new_rate = clk_round_rate(dac->sample_clk, 256 * new_rate);
 -              if (new_rate < 0)
 +              if (new_rate <= 0)
                        break;
                /* make sure we are below the ABDAC clock */
-               if (new_rate <= clk_get_rate(dac->pclk)) {
+               if (index < MAX_NUM_RATES &&
+                   new_rate <= clk_get_rate(dac->pclk)) {
                        dac->rates[index] = new_rate / 256;
                        index++;
                }

diff --cc sound/pci/hda/hda_generic.c
Simple merge

diff --cc sound/pci/hda/hda_intel.c
Simple merge

diff --cc sound/pci/hda/patch_analog.c
Simple merge

diff --cc sound/pci/hda/patch_hdmi.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge