Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Sep 2012 22:47:24 +0000 (15:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Sep 2012 22:47:24 +0000 (15:47 -0700)
commite556cb3e330d231628ccb5110c49811b618ad5b9
tree912e632c7aaca0280419211f22f494b07de4808b
parentb56adb54e825fc548126b20b479d138a683d2b8c
parent84d5dfbf09be6be71d6dda63d99a8303e85663c7
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.