From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 27 Sep 2012 22:47:24 +0000 (-0700)
Subject: Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: MMI-PSA29.97-13-9~15946
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e556cb3e330d231628ccb5110c49811b618ad5b9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'fixes-for-linus' of git://git./linux/kernel/git/arm/arm-soc

Pull one more arm-soc bugfix from Olof Johansson:
 "Here's a bugfix for orion5x.  Without this, PCI doesn't initialize
  properly because of too small coherent pool to cover the allocations
  needed.

  A similar fix has already been done on kirkwood."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: Orion5x: Fix too small coherent pool.
---

e556cb3e330d231628ccb5110c49811b618ad5b9