diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-13 11:54:00 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-13 11:54:00 +1000 |
| commit | e5e58d714197f006f6382525966134bdaeade06f (patch) | |
| tree | 2f7ed4749ee3000eed5b909ccc4b9aa6ceb4e402 | |
| parent | 91ccff5df49f9833068c4a686be5ec41cf325ff3 (diff) | |
| parent | 970379f59d81edf78a319f9cdc1234730bcbe6b2 (diff) | |
Merge remote-tracking branch 'vhost/linux-next'
Conflicts:
drivers/vhost/net.c
0 files changed, 0 insertions, 0 deletions