Merge branch 'for-linus' into for-next

Merged upstream branch to make further fireworks development easier
(and avoid conflicts earlier).

Conflicts:
	sound/firewire/bebob/bebob_focusrite.c

diff --cc sound/core/pcm_native.c
Simple merge

diff --cc sound/firewire/bebob/bebob_focusrite.c
index a45a86952a415a02b63e036ca6962cb4922b93d8,3b052ed0fbf58d284d55b562ac46ec1ee65cc763..fc67c1b7cb5b7576be3fbd88c948c7813c1aa57d
--- 1/sound/firewire/bebob/bebob_focusrite.c
--- 2/sound/firewire/bebob/bebob_focusrite.c
+++ b/sound/firewire/bebob/bebob_focusrite.c
@@@ -101,13 -103,34 +103,34 @@@ saffire_write_quad(struct snd_bebob *be
                                  &data, sizeof(__be32), 0);
  }
  
 -static char *const saffirepro_10_clk_src_labels[] = {
++static const char *const saffirepro_10_clk_src_labels[] = {
+       SND_BEBOB_CLOCK_INTERNAL, "S/PDIF", "Word Clock"
+ };
 -static char *const saffirepro_26_clk_src_labels[] = {
 +static const char *const saffirepro_26_clk_src_labels[] = {
        SND_BEBOB_CLOCK_INTERNAL, "S/PDIF", "ADAT1", "ADAT2", "Word Clock"
  };
- 
- static const char *const saffirepro_10_clk_src_labels[] = {
-       SND_BEBOB_CLOCK_INTERNAL, "S/PDIF", "Word Clock"
+ /* Value maps between registers and labels for SaffirePro 10/26. */
+ static const signed char saffirepro_clk_maps[][SAFFIREPRO_CLOCK_SOURCE_COUNT] = {
+       /* SaffirePro 10 */
+       [0] = {
+               [SAFFIREPRO_CLOCK_SOURCE_INTERNAL]  =  0,
+               [SAFFIREPRO_CLOCK_SOURCE_SKIP]      = -1, /* not supported */
+               [SAFFIREPRO_CLOCK_SOURCE_SPDIF]     =  1,
+               [SAFFIREPRO_CLOCK_SOURCE_ADAT1]     = -1, /* not supported */
+               [SAFFIREPRO_CLOCK_SOURCE_ADAT2]     = -1, /* not supported */
+               [SAFFIREPRO_CLOCK_SOURCE_WORDCLOCK] =  2,
+       },
+       /* SaffirePro 26 */
+       [1] = {
+               [SAFFIREPRO_CLOCK_SOURCE_INTERNAL]  =  0,
+               [SAFFIREPRO_CLOCK_SOURCE_SKIP]      = -1, /* not supported */
+               [SAFFIREPRO_CLOCK_SOURCE_SPDIF]     =  1,
+               [SAFFIREPRO_CLOCK_SOURCE_ADAT1]     =  2,
+               [SAFFIREPRO_CLOCK_SOURCE_ADAT2]     =  3,
+               [SAFFIREPRO_CLOCK_SOURCE_WORDCLOCK] =  4,
+       }
  };
+ 
  static int
  saffirepro_both_clk_freq_get(struct snd_bebob *bebob, unsigned int *rate)
  {

diff --cc sound/firewire/bebob/bebob_terratec.c
Simple merge