diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 00:15:35 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 00:15:35 -0800 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /drivers/scsi/qla2xxx/qla_version.h | |
| parent | 1bded710a574f20d41bc9e7fb531301db282d623 (diff) | |
| parent | fb53fde9762432d091dac209bdf4f3f850117c55 (diff) | |
| download | blackbird-op-linux-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.tar.gz blackbird-op-linux-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_version.h')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h index 808bab6ef06b..cfa4c11a4797 100644 --- a/drivers/scsi/qla2xxx/qla_version.h +++ b/drivers/scsi/qla2xxx/qla_version.h @@ -7,7 +7,7 @@ /* * Driver version */ -#define QLA2XXX_VERSION "8.03.00-k1" +#define QLA2XXX_VERSION "8.03.00-k2" #define QLA_DRIVER_MAJOR_VER 8 #define QLA_DRIVER_MINOR_VER 3 |
