Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
	drivers/staging/media/go7007/go7007-usb.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/staging/media/go7007/go7007-usb.c
index b658c2316df340b4480ed72ca90d457d913e3691,1d747de6dfa6aab67773430e3afd474633967b17..158898403de8a0170b5c88c65404efe62d35460e
--- 1/drivers/staging/media/go7007/go7007-usb.c
--- 2/drivers/staging/media/go7007/go7007-usb.c
+++ b/drivers/staging/media/go7007/go7007-usb.c
@@@ -1099,13 -1097,16 +1099,15 @@@ static int go7007_usb_probe(struct usb_
                board = &board_px_tv402u;
                break;
        case GO7007_BOARDID_LIFEVIEW_LR192:
 -              printk(KERN_ERR
 -                     "The Lifeview TV Walker Ultra is not supported. Sorry!\n");
 +              dev_err(&intf->dev, "The Lifeview TV Walker Ultra is not supported. Sorry!\n");
                return -ENODEV;
+ #if 0
                name = "Lifeview TV Walker Ultra";
                board = &board_lifeview_lr192;
                break;
+ #endif
        case GO7007_BOARDID_SENSORAY_2250:
 -              printk(KERN_INFO "Sensoray 2250 found\n");
 +              dev_info(&intf->dev, "Sensoray 2250 found\n");
                name = "Sensoray 2250/2251";
                board = &board_sensoray_2250;
                break;