diff options
| author | Tejun Heo <tj@kernel.org> | 2012-11-07 00:26:23 +0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2012-11-07 00:26:23 +0400 |
| commit | 5b805f2a7675634fbdf9ac1c9b2256905ab2ea68 (patch) | |
| tree | ee00d1e3d757458d66209b926d274491c6c3f61c /arch/hexagon/include/uapi/asm/kvm_para.h | |
| parent | 1db1e31b1ee3ae126ef98f39083b5f213c7b41bf (diff) | |
| parent | 201e72acb2d3821e2de9ce6091e98859c316b29a (diff) | |
| download | linux-5b805f2a7675634fbdf9ac1c9b2256905ab2ea68.tar.xz | |
Merge branch 'cgroup/for-3.7-fixes' into cgroup/for-3.8
This is to receive device_cgroup fixes so that further device_cgroup
changes can be made in cgroup/for-3.8.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/hexagon/include/uapi/asm/kvm_para.h')
| -rw-r--r-- | arch/hexagon/include/uapi/asm/kvm_para.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/hexagon/include/uapi/asm/kvm_para.h b/arch/hexagon/include/uapi/asm/kvm_para.h new file mode 100644 index 000000000000..14fab8f0b957 --- /dev/null +++ b/arch/hexagon/include/uapi/asm/kvm_para.h @@ -0,0 +1 @@ +#include <asm-generic/kvm_para.h> |