diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-11 12:09:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-11 12:09:37 -0800 |
| commit | 14ba9a2e4bacc6f5a0dbe0de5390daedd544508f (patch) | |
| tree | 90b0d639f577feada25fb56837c3e8350b7de035 /drivers/net/macvtap.c | |
| parent | b859e7d13bcc18b56faa7e2f78db5ba8ab874a15 (diff) | |
| parent | 86c22f8c9a3b71d42d38bfcd80372de72f573713 (diff) | |
| download | linux-14ba9a2e4bacc6f5a0dbe0de5390daedd544508f.tar.bz2 | |
Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox framework updates from Jassi Brar.
* 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
Mailbox: Add support for Platform Communication Channel
mailbox/omap: adapt to the new mailbox framework
mailbox: add tx_prepare client callback
mailbox: Don't unnecessarily re-arm the polling timer
Diffstat (limited to 'drivers/net/macvtap.c')
0 files changed, 0 insertions, 0 deletions