diff options
| author | Christoffer Dall <christoffer.dall@linaro.org> | 2014-09-18 18:15:32 -0700 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2014-09-18 18:15:32 -0700 |
| commit | a875dafcf9b6b266c855e1f9b0aa060ef585d38a (patch) | |
| tree | 1903cb0a39ac1cade1940ccb559591cddf3660a0 /net/Makefile | |
| parent | 0ba09511ddc3ff0b462f37b4fe4b9c4dccc054ec (diff) | |
| parent | f51770ed465e6eb41da7fa16fd92eb67069600cf (diff) | |
| download | linux-stable-a875dafcf9b6b266c855e1f9b0aa060ef585d38a.tar.gz linux-stable-a875dafcf9b6b266c855e1f9b0aa060ef585d38a.tar.bz2 linux-stable-a875dafcf9b6b266c855e1f9b0aa060ef585d38a.zip | |
Merge remote-tracking branch 'kvm/next' into queue
Conflicts:
arch/arm64/include/asm/kvm_host.h
virt/kvm/arm/vgic.c
Diffstat (limited to 'net/Makefile')
0 files changed, 0 insertions, 0 deletions