Merge tag 'arc-v3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc

Pull ARC fix from Vineet Gupta:
 "SMP build breakage fix"

* tag 'arc-v3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: SMP build breakage
Merge tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394

Pull firewire regression fix from Stefan Richter:
 "This fixes corrupted video capture, seen with IIDC/DCAM video and
  certain buffer settings.  (Regression since v3.4 inclusive.)"

* tag 'firewire-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
  firewire: fix libdc1394/FlyCap2 iso event regression
sdma-imx: Add SDMA firmware for Freescale i.MX SOCs

Add SDMA firmware for Freescale i.MX SOCs.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
ARM: mx6: Use the same sdma firmware name for all mx6 variants

All the mx6 variants (quad, dual, solo and solo-lite) use the same sdma
firmware, so drop the the suffix from the file name.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Hack! firmware,imx6: ship sdma blob

Signed-off-by: Vincent Stehlé <vincent.stehle@freescale.com>