diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-11-10 08:51:27 -0500 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-11-10 08:51:27 -0500 |
| commit | 00e375e7e962f938f6b3c93e4cd097a5e26cc788 (patch) | |
| tree | 9aacf8566c688273af830fc4e50186810068b028 /include | |
| parent | f85acd81aa623e3dcf268c90e5cd8ecf36830984 (diff) | |
| parent | 4205df34003eec4371020872cdfa228ffae5bd6a (diff) | |
Merge branch 'for-2.6.37/drivers' into for-linus
Conflicts:
drivers/block/cciss.c
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/drbd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/drbd.h b/include/linux/drbd.h index 9b2a0158f399..ef44c7a0638c 100644 --- a/include/linux/drbd.h +++ b/include/linux/drbd.h | |||
| @@ -53,7 +53,7 @@ | |||
| 53 | 53 | ||
| 54 | 54 | ||
| 55 | extern const char *drbd_buildtag(void); | 55 | extern const char *drbd_buildtag(void); |
| 56 | #define REL_VERSION "8.3.9rc2" | 56 | #define REL_VERSION "8.3.9" |
| 57 | #define API_VERSION 88 | 57 | #define API_VERSION 88 |
| 58 | #define PRO_VERSION_MIN 86 | 58 | #define PRO_VERSION_MIN 86 |
| 59 | #define PRO_VERSION_MAX 95 | 59 | #define PRO_VERSION_MAX 95 |