From: <mikem@beardog.cca.cpqcorp.net>

The following patch bumps the driver version to 2.6.0.  Please apply in
order.