From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Dec 2011 21:45:34 +0000 (-0800)
Subject: Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur... 
X-Git-Tag: firefly_0821_release~3680^2~3867
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=06867fbb8abc936192195e5dcc4b63e12cc78f72;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fixes' of ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
  ARM: 7237/1: PL330: Fix driver freeze
  ARM: 7197/1: errata: Remove SMP dependency for erratum 751472
  ARM: 7196/1: errata: Remove SMP dependency for erratum 720789
  ARM: 7220/1: mmc: mmci: Fixup error handling for dma
  ARM: 7214/1: mmc: mmci: Fixup handling of MCI_STARTBITERR
---

06867fbb8abc936192195e5dcc4b63e12cc78f72