diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-10-17 17:04:47 +0300 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-10-17 17:41:49 +0300 |
| commit | 13acfd5715144518232d8e29acf7c76ef1b089d8 (patch) | |
| tree | 093c4311a737210bbdd3d1919f8193cb5f017241 /tools/lib/lk/debugfs.c | |
| parent | d570142674890fe10b3d7d86aa105e3dfce1ddfa (diff) | |
| parent | 34ec4de42be5006abdd8d0c08b306ffaa64d0d5d (diff) | |
| download | op-kernel-dev-13acfd5715144518232d8e29acf7c76ef1b089d8.zip op-kernel-dev-13acfd5715144518232d8e29acf7c76ef1b089d8.tar.gz | |
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 'tools/lib/lk/debugfs.c')
| -rw-r--r-- | tools/lib/lk/debugfs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/lib/lk/debugfs.c b/tools/lib/lk/debugfs.c index 099e7cd..7c43479 100644 --- a/tools/lib/lk/debugfs.c +++ b/tools/lib/lk/debugfs.c @@ -5,7 +5,6 @@ #include <stdbool.h> #include <sys/vfs.h> #include <sys/mount.h> -#include <linux/magic.h> #include <linux/kernel.h> #include "debugfs.h" |
