diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-10-17 14:04:47 (GMT) |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-10-17 14:41:49 (GMT) |
| commit | 13acfd5715144518232d8e29acf7c76ef1b089d8 (patch) | |
| tree | 093c4311a737210bbdd3d1919f8193cb5f017241 /include/asm-generic/vtime.h | |
| parent | d570142674890fe10b3d7d86aa105e3dfce1ddfa (diff) | |
| parent | 34ec4de42be5006abdd8d0c08b306ffaa64d0d5d (diff) | |
| download | linux-13acfd5715144518232d8e29acf7c76ef1b089d8.tar.xz | |
Powerpc KVM work is based on a commit after rc4.
Merging master into next to satisfy the dependencies.
Conflicts:
arch/arm/kvm/reset.c
Diffstat (limited to 'include/asm-generic/vtime.h')
| -rw-r--r-- | include/asm-generic/vtime.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/vtime.h b/include/asm-generic/vtime.h index e69de29..b1a4967 100644 --- a/include/asm-generic/vtime.h +++ b/include/asm-generic/vtime.h @@ -0,0 +1 @@ +/* no content, but patch(1) dislikes empty files */ |