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)
commit7e0a6fd5a4723c79cc46c9541e343092302e0e5b
tree7b1e3e7512eecdcc94811982766c25d64150a200
parentca90666287401b475d9e0becf85bd02f069f1de8
parent6cfa6279edbffa921b7d8c9519bfd83a24ba508e
Merge branch 'amba' of ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

* '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