diff options
| author | Paolo Bonzini <[email protected]> | 2016-06-14 11:00:16 +0200 |
|---|---|---|
| committer | Paolo Bonzini <[email protected]> | 2016-06-14 11:00:16 +0200 |
| commit | 0699fdb380a847dcd4b74bbca6078bdb20033366 (patch) | |
| tree | 01d6a7f1436960273ea56ff86dd01257d672b82d /net/unix/sysctl_net_unix.c | |
| parent | c1b8bfb08f25d1cb9ef2bc93229107113a41ad8c (diff) | |
| parent | 6df82a7b88dc9b0b519765562b005ef9196d812a (diff) | |
Merge branch 'kvm-mips-fixes' into HEAD
Merge MIPS patches destined to both 4.7 and kvm/next, to avoid
unnecessary conflicts.
Signed-off-by: Paolo Bonzini <[email protected]>
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions