diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-27 08:40:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-27 08:40:50 +0200 |
| commit | 7e0a6fd5a4723c79cc46c9541e343092302e0e5b (patch) | |
| tree | 7b1e3e7512eecdcc94811982766c25d64150a200 /drivers/spi/spi-stmp.c | |
| parent | ca90666287401b475d9e0becf85bd02f069f1de8 (diff) | |
| parent | 6cfa6279edbffa921b7d8c9519bfd83a24ba508e (diff) | |
| download | linux-7e0a6fd5a4723c79cc46c9541e343092302e0e5b.tar.gz linux-7e0a6fd5a4723c79cc46c9541e343092302e0e5b.tar.bz2 linux-7e0a6fd5a4723c79cc46c9541e343092302e0e5b.zip | |
Merge branch 'amba' of http://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
Diffstat (limited to 'drivers/spi/spi-stmp.c')
0 files changed, 0 insertions, 0 deletions