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

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-4965-rs.c
	drivers/net/wireless/rt2x00/rt61pci.c

1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 50ccf3771204..3e4f3c7e92e7 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -420,7 +420,13 @@ struct usb_device_id em28xx_id_table [] = {
                         .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 },
         { USB_DEVICE(0x2040, 0x6502),
                         .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900 },
-        { USB_DEVICE(0x2040, 0x6513),
+        { USB_DEVICE(0x2040, 0x6513), /* HCW HVR-980 */
+                        .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 },
+        { USB_DEVICE(0x2040, 0x6517), /* HP  HVR-950 */
+                        .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 },
+        { USB_DEVICE(0x2040, 0x651b), /* RP  HVR-950 */
+                        .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 },
+        { USB_DEVICE(0x2040, 0x651f), /* HCW HVR-850 */
                         .driver_info = EM2880_BOARD_HAUPPAUGE_WINTV_HVR_950 },
         { USB_DEVICE(0x0ccd, 0x0042),
                         .driver_info = EM2880_BOARD_TERRATEC_HYBRID_XS },