diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-02-19 13:52:40 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-02-19 13:52:40 +1100 |
| commit | 3e04ee336824eb83ed7da3a90d664ac9d14ae565 (patch) | |
| tree | 9d4b66934ddb7955845f627f5dc72c0e4d2884bb | |
| parent | cc7fa97ff42319d3b9fa223354a6655e571bd6d3 (diff) | |
| parent | ac26e40d1c8a9f1898939efa0e1e5681d422c2ec (diff) | |
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/vhost/net.c
0 files changed, 0 insertions, 0 deletions