diff options
author | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 23:30:58 (GMT) |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2010-05-17 23:30:58 (GMT) |
commit | 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 (patch) | |
tree | fcf504879883763557e696eff81427b1ab78f76b /Makefile | |
parent | 058276303dbc4ed089c1f7dad0871810b1f5ddf1 (diff) | |
parent | caa20d974c86af496b419eef70010e63b7fab7ac (diff) | |
download | linux-0b28330e39bbe0ffee4c56b09fc415fcec595ea3.tar.xz |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 34 -EXTRAVERSION = -rc2 +EXTRAVERSION = -rc4 NAME = Man-Eating Seals of Antiquity # *DOCUMENTATION* |