diff options
| author |   Grant Likely <grant.likely@secretlab.ca> | 2012-01-30 08:32:37 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-01-30 08:32:37 -0700 |
| commit | bc266185888e4033d8439b4fc6bdd14a41f4041e (patch) | |
| tree | 1455fafca38f366b092766594b9d71975bc12d50 /drivers/spi/spi-omap2-mcspi.c | |
| parent | Linux 3.3-rc1 (diff) | |
| parent | spi/s3c64xx: Implement runtime PM support (diff) | |
| download | linux-dev-bc266185888e4033d8439b4fc6bdd14a41f4041e.tar.xz linux-dev-bc266185888e4033d8439b4fc6bdd14a41f4041e.zip | |
Merge branch 'spi/s3c64xx' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc
Conflicts:
drivers/spi/spi-s3c64xx.c
Diffstat (limited to 'drivers/spi/spi-omap2-mcspi.c')
0 files changed, 0 insertions, 0 deletions