Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index 0713872cf65c..a742efa0da2b 100644
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -27,7 +27,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME        "pata_hpt366"
-#define DRV_VERSION     "0.6.1"
+#define DRV_VERSION     "0.6.2"
 
 struct hpt_clock {
         u8      xfer_speed;
@@ -180,9 +180,9 @@ static unsigned long hpt366_filter(struct ata_device *adev, unsigned long mask)
                 if (hpt_dma_blacklisted(adev, "UDMA",  bad_ata33))
                         mask &= ~ATA_MASK_UDMA;
                 if (hpt_dma_blacklisted(adev, "UDMA3", bad_ata66_3))
-                        mask &= ~(0x07 << ATA_SHIFT_UDMA);
+                        mask &= ~(0xF8 << ATA_SHIFT_UDMA);
                 if (hpt_dma_blacklisted(adev, "UDMA4", bad_ata66_4))
-                        mask &= ~(0x0F << ATA_SHIFT_UDMA);
+                        mask &= ~(0xF0 << ATA_SHIFT_UDMA);
         }
         return ata_pci_default_filter(adev, mask);
 }