diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-25 12:36:02 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-25 12:36:02 -0400 |
| commit | 456ba5a7802e58eccb5aa9751b3ab515ef99b9ca (patch) | |
| tree | 4ca4dd3726b34dead51af13b67475af7bf857893 /include/uapi/asm-generic | |
| parent | 05304949332c6d2c7b50f2d0f666a52369f09ced (diff) | |
| parent | 79748cdb39dbf914bc5f26c75cfd5f91d84d82c9 (diff) | |
Merge remote-tracking branches 'asoc/fix/ux500' and 'asoc/fix/wm8994' into for-3.7
Diffstat (limited to 'include/uapi/asm-generic')
| -rw-r--r-- | include/uapi/asm-generic/kvm_para.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/asm-generic/kvm_para.h b/include/uapi/asm-generic/kvm_para.h index e69de29bb2d1..486f0af73c39 100644 --- a/include/uapi/asm-generic/kvm_para.h +++ b/include/uapi/asm-generic/kvm_para.h | |||
| @@ -0,0 +1,4 @@ | |||
| 1 | /* | ||
| 2 | * There isn't anything here, but the file must not be empty or patch | ||
| 3 | * will delete it. | ||
| 4 | */ | ||