Merge branch 'for-linus' into for-next

Resolve conflicts and correct the hex numbers, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

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

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

diff --cc sound/usb/format.c
index 5e7c4c7,53922f7..9260136
--- 1/sound/usb/format.c
--- 2/sound/usb/format.c
+++ b/sound/usb/format.c
@@@ -292,10 -292,13 +292,13 @@@ static int line6_parse_audio_format_rat
                                                struct audioformat *fp)
  {
        switch (chip->usb_id) {
 -      case USB_ID(0x0E41, 0x4241): /* Line6 Helix */
 -      case USB_ID(0x0E41, 0x4242): /* Line6 Helix Rack */
 -      case USB_ID(0x0E41, 0x4244): /* Line6 Helix LT */
 -      case USB_ID(0x0E41, 0x4246): /* Line6 HX-Stomp */
 -      case USB_ID(0x0E41, 0x4248): /* Line6 Helix >= fw 2.82 */
 -      case USB_ID(0x0E41, 0x4249): /* Line6 Helix Rack >= fw 2.82 */
 -      case USB_ID(0x0E41, 0x424a): /* Line6 Helix LT >= fw 2.82 */
 +      case USB_ID(0x0e41, 0x4241): /* Line6 Helix */
 +      case USB_ID(0x0e41, 0x4242): /* Line6 Helix Rack */
 +      case USB_ID(0x0e41, 0x4244): /* Line6 Helix LT */
 +      case USB_ID(0x0e41, 0x4246): /* Line6 HX-Stomp */
++      case USB_ID(0x0e41, 0x4248): /* Line6 Helix >= fw 2.82 */
++      case USB_ID(0x0e41, 0x4249): /* Line6 Helix Rack >= fw 2.82 */
++      case USB_ID(0x0e41, 0x424a): /* Line6 Helix LT >= fw 2.82 */
                /* supported rates: 48Khz */
                kfree(fp->rate_table);
                fp->rate_table = kmalloc(sizeof(int), GFP_KERNEL);