diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-08 19:05:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-08 19:05:47 -0800 |
| commit | 4a68d54c983514f123e99fc720951a4ee4d84270 (patch) | |
| tree | 0c7c7fba0a38a65dcd061956eee0cb39c918e98a /tools/perf/scripts/python/sctop.py | |
| parent | Merge branch 'akpm' (Andrew's tree) (diff) | |
| parent | spi-topcliff-pch: rename pch_spi_pcidev to pch_spi_pcidev_driver (diff) | |
| download | wireguard-linux-4a68d54c983514f123e99fc720951a4ee4d84270.tar.xz wireguard-linux-4a68d54c983514f123e99fc720951a4ee4d84270.zip | |
Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
SPI bug fixes for v3.3-rc2
Minor SPI device driver changes. A rename of the pch_spi_pcidev symbol
that merely eliminates a modpost warning, and a Kconfig change to allow
the Samsung spi driver to build on EXYNOS.
* tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
spi-topcliff-pch: rename pch_spi_pcidev to pch_spi_pcidev_driver
spi: Add spi-s3c64xx driver dependency on ARCH_EXYNOS4
Diffstat (limited to 'tools/perf/scripts/python/sctop.py')
0 files changed, 0 insertions, 0 deletions