diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:17:14 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:17:14 -0400 |
| commit | 620f2efcdc5c7a2db68da41bc3df3cf9a718024e (patch) | |
| tree | b1a0411e2588953777d0b10245b12044c33cef54 /include/linux/dlm_device.h | |
| parent | 04944b793e18ece23f63c0252646b310c1845940 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/xsave
Diffstat (limited to 'include/linux/dlm_device.h')
| -rw-r--r-- | include/linux/dlm_device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dlm_device.h b/include/linux/dlm_device.h index c6034508fed9..3060783c4191 100644 --- a/include/linux/dlm_device.h +++ b/include/linux/dlm_device.h | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | /* Version of the device interface */ | 26 | /* Version of the device interface */ |
| 27 | #define DLM_DEVICE_VERSION_MAJOR 6 | 27 | #define DLM_DEVICE_VERSION_MAJOR 6 |
| 28 | #define DLM_DEVICE_VERSION_MINOR 0 | 28 | #define DLM_DEVICE_VERSION_MINOR 0 |
| 29 | #define DLM_DEVICE_VERSION_PATCH 0 | 29 | #define DLM_DEVICE_VERSION_PATCH 1 |
| 30 | 30 | ||
| 31 | /* struct passed to the lock write */ | 31 | /* struct passed to the lock write */ |
| 32 | struct dlm_lock_params { | 32 | struct dlm_lock_params { |