Merge branch 'amba' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Oct 2011 06:40:50 +0000 (08:40 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Oct 2011 06:40:50 +0000 (08:40 +0200)
* 'amba' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
  ARM: 7079/1: spi: Fix builderror in spi-pl022.c
  PM: add runtime PM support to MMCI
  PM: add runtime PM support to core Primecell driver


Trivial merge