diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 14:51:02 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 14:51:02 +1100 |
| commit | ddb758d5bb04265c29afbec3496f4b2f2fc2aa09 (patch) | |
| tree | 3fb77c5b711228b0dd921cbbcaba555a928a9e27 /Documentation | |
| parent | c320d64f16f365cfac044a595434bcaff4bee657 (diff) | |
| parent | f8ce25620cdce9bb71072c5480591607f8e828ac (diff) | |
Merge remote-tracking branch 'spi/for-next'
Conflicts:
drivers/spi/spi.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/driver-model/devres.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/driver-model/devres.txt b/Documentation/driver-model/devres.txt index 3d9c2a766230..5bdc8cb5fc28 100644 --- a/Documentation/driver-model/devres.txt +++ b/Documentation/driver-model/devres.txt @@ -303,3 +303,6 @@ PHY SLAVE DMA ENGINE devm_acpi_dma_controller_register() + +SPI + devm_spi_register_master() |