diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-01 13:10:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-01 13:10:03 -0700 |
| commit | 477d7caeede0e3a933368440fc877b12c25dbb6d (patch) | |
| tree | e35e179a5231dd0501aa9f3868d342bd77e30a96 /drivers/ide/ide-proc.c | |
| parent | 6fb41cbd7d82f7b9e41db6245f6a46c84ca3083e (diff) | |
| parent | cb710ab1d8a23f68ff8f45aedf3e552bb90e70de (diff) | |
Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox updates from Jassi Brar:
- new driver for Broadcom FlexRM controller
- constify data structures of callback functions in some drivers
- a few bug fixes uncovered by multi-threaded use of mailbox channels
in blocking mode
* 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
mailbox: handle empty message in tx_tick
mailbox: skip complete wait event if timer expired
mailbox: always wait in mbox_send_message for blocking Tx mode
mailbox: Remove depends on COMPILE_TEST for BCM_FLEXRM_MBOX
mailbox: check ->last_tx_done for NULL in case of timer-based polling
dt-bindings: Add DT bindings info for FlexRM ring manager
mailbox: Add driver for Broadcom FlexRM ring manager
dt-bindings: mailbox: Update doc with NSP PDC/mailbox support
mailbox: bcm-pdc: Add Northstar Plus support to PDC driver
mailbox: constify mbox_chan_ops structures
Diffstat (limited to 'drivers/ide/ide-proc.c')
0 files changed, 0 insertions, 0 deletions